refactoring
Merge remote-tracking branch 'origin/feature/email_registration_confirmation' into feature/email_registration_confirmation

Conflicts:
	src/main/webapp/WEB-INF/tiles-defs/template-defs.xml
refactoring
Merge branch 'feature/email_registration_confirmation' of https://github.com/originalrusyn/novotvir into feature/email_registration_confirmation
refactoring