Merge development into ceylan

Conflicts:
	admin/activities.php
	models/Activity.php