Updating
Merge remote-tracking branch 'upstream/havoc' into havoc

Conflicts:
	src/main/webapp/WEB-INF/pages/home.jsp
Working on routing
Starting routing for the Account page
Merge remote-tracking branch 'upstream/havoc' into havoc

Conflicts:
	src/main/webapp/WEB-INF/pages/account.jsp
	src/main/webapp/app/TatamiApp.js
	src/main/webapp/app/components/home/post/PostView.html
	src/main/webapp/app/components/home/post/StatusCreateController.js
	src/main/webapp/app/shared/topmenu/TopMenuPartial.html
Significant progress on the account page and routing
Merge remote-tracking branch 'upstream/havoc' into havoc

Conflicts:
	src/main/webapp/app/components/account/profile/ProfileView.html
Merge remote-tracking branch 'upstream/havoc' into havoc
Significant progress on Account page. Need to change naming scheme due to previous one introducing bug on timeline
Merge pull request #687 from hegek87/havoc

Progress on account page routing
Changed file names in account/groups and account/profile
Merge pull request #688 from hegek87/havoc

Changed file names in account/groups and account/profile
restored original jsps and files from old commit

from de747fe804c8dc36fa44b4aa7090903b51a88787
removed comment
code style fixes and pluralization of some modules
moved MomentConfig to shared folder
fixed some translation keys
added UserService