Quick code style fix

Conflicts:
	src/main/webapp/resources/js/ng/controllers.js
Merge pull request #28 from AlexWyrm/master

Quick code style fix