Merge branch 'master' of https://github.com/DennisBuijs/Questionmark

Conflicts:
	models/enquete_model.php
Merge branch 'master' of https://github.com/DennisBuijs/Questionmark

Conflicts:
	models/enquete_model.php