Чучуть к регистрации
Merge remote-tracking branch 'origin/master' into master12

Conflicts:
	app/controllers/Upload.java