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

Conflicts:
	src/aliases.php
	src/classes/Config.php
	tests/ArxTest.php