starting debug
Merge branch 'dev-master' of https://github.com/cherrylabs/arx-core into dev-master

Conflicts:
	src/Arx/classes/App.php
	src/config/autoload.php
	src/core.php