double to single quotes
fixed accidental rename of path
quick fix for avatar network error
Merge remote-tracking branch 'upstream/havoc' into havoc
added reminder comment
Merge remote-tracking branch 'upstream/havoc' into havoc

Conflicts:
	src/main/webapp/app/components/home/sidebar/SidebarView.html
	src/main/webapp/app/components/home/sidebar/UserController.js
tab to 4 spaces
possible unnecessary variable
made angular-translate an app dependency
Merge pull request #664 from jnarron/havoc

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