+ removed extraneous debugging
Merge branch 'master' into release/1.6

Conflicts:
	controllers/AdminController.php