mage temp commit

working on it
Merge remote-tracking branch 'origin/master'

Conflicts:
	ClassLibs/Mage/Functions.lua