View without services
Merge branch 'master' of https://github.com/balhar-jakub/minorLarpProjects

Conflicts:
	DiMaestro/app/viewmodels/registration/prihlasovaciDialog.js
	DiMaestro/app/views/registration/prihlasovaciDialog.html
Preparation foranswers
Preparation foranswers