Merge pull request #664 from jnarron/havoc

Make angular-translate an app dependency instead of timeline module dependency plus other minor style fixes