Added function filter to propositionsController
Merge remote-tracking branch 'origin/dev' into nrvnTesting

Conflicts:
	protected/views/questions/error.php
Getting question id auto for propositions,  added a route
Merged from dev
Fixed conflict
Merge remote-tracking branch 'origin/nrvnTesting' into dev