New partial commit
Merge branch 'master' into super-quiz

Conflicts:
	app/Controller/UsersController.php
	partisk.sql