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