code cleanup, removed config manipulations functions
Merge commit '1d10282b6c4ce10ab78d0f43dbd47642fa5ca8e5'

Conflicts:
	controllers/BaseAppController.php