Merge branch 'master' into v0.4.0

Author Noshei <Noshei.Rift@gmail.com>
Author date 2014-02-20 23:44:03
Author local date 2014-02-20 16:44:03 -0700
Committer Noshei <Noshei.Rift@gmail.com>
Committer date 2014-02-20 23:44:03
Committer local date 2014-02-20 16:44:03 -0700
Commit 555241438ca680fd18aa40b13ad6b4a3cd920706
Tree afc1f3f2afea9be422d5c78546a4a2d79a7130bc
Parent 5a4949794c26a57eff4edd17ddd756c04165100d
Parent 4c00790ff885aaef251d38e4f12262161b784cb7
Merge branch 'master' into v0.4.0

Conflicts:
	RiftAddon.toc