cleanup
Merge branch 'master' of https://github.com/atk4/agiletoolkit-bundle

Conflicts:
	admin/lib/Admin.php