Fixed QuestionGroup code
Merge remote-tracking branch 'origin/PouleRequestTesting' into dev
Added function filter

propositionController
Added a beforeFilter to get the QGroupID from the route
Fixed the MAR extension

Wrong folder. Whoops.
Merge remote-tracking branch 'origin/PouleRequestTesting' into dev
Added filterGetQuestion
Added page when proposition cannot be delete
Added the "List surveys" feature
Merge remote-tracking branch 'origin/dev' into nrvnTesting

Conflicts:
	protected/views/questions/error.php