Fix formatting to match styleguide and jsbeautify and csscomb
Merge pull request #41 from zanata/fix-formatting

Fix formatting to match styleguide and jsbeautify and csscomb
Merge branch 'master' into transunit-controller

Conflicts:
	app/components/phrases/PhraseService.js
	app/components/transUnit/transUnitDirective.js
	app/editor/EditorCtrl.js