28/10/14 14h
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	sys/src/quizz/controller.php
	sys/src/quizz/view/theme_list.php