Merge origin/master

Conflicts:
	app/modules/askquestions/administration/view/groups.php
	app/modules/askquestions/controller/questions.php
Changes towards version 1.0