Merge origin/master

Conflicts:
	app/controller/SecurityController.php
	app/view/admin/activities/view.phtml
	app/view/admin/activitytype/view.phtml