mt1
mt2
mt3
mt4
mt5
mt6
mt7
mt8
mt9
mt10
mt11
mt12
mt12
mt13
mt14
Merge branch 'quizzesController' of github.com:d3orn/hikomsys into quizzesController

Conflicts:
	website/hikomsys/app/controllers/QuizzesController.php