fix
pre-alpha backup
Merge branch 'master' of https://github.com/MGrossert/PYApp

Conflicts:
	py/system/classes/System.php
	py/system/traits/Singleton.php