change Mage.php
update sample file
Merge branch 'tuhn2' into develop

Conflicts:
	app/Mage.php