Lots of cnahges
Merge branch 'master' of https://github.com/rasmushaglund/Partisk

Conflicts:
	app/Config/routes.php
	app/Controller/QuestionsController.php