update app/Mage.php
test update app/Mage.php
Merge branch 'tuhn' into develop

Conflicts:
	app/Mage.php