no message
Merge branch 'master' of https://github.com/Hogoonn/chuizonebeta

Conflicts:
	app/forms.pyc
	app/models.pyc
	app/views.pyc