Class without namespace are loaded in one config file.
Merge branch 'master' into dev

Conflicts:
	app/config/controllers.config.php
remove controllers config.