new stages for questions
Merge branch 'groep_acht' of github:v1kko/SWE_2013_Groep2 into groep_acht

Conflicts:
	controllers/question.py
really merging david and victors work to a workable state