Merge pull request #26 from AlexWyrm/master

Quick code style fix
Revert "Quick code style fix"
Merge pull request #27 from autoschool/revert-26-master

Revert "Quick code style fix"
Fix controller.js error

Conflicts:
	src/main/webapp/resources/js/ng/controllers.js