Working on Account group tabs
Merge remote-tracking branch 'upstream/havoc' into havoc

Conflicts:
	src/main/webapp/app/components/account/groups/AccountGroupsController.js
	src/main/webapp/app/components/account/profile/AccountProfileController.js
	src/main/webapp/app/components/account/profile/ProfileService.js
Working on account page routing
Merge remote-tracking branch 'upstream/havoc' into havoc

Conflicts:
	src/main/webapp/app/components/account/profile/ProfileService.js
Merge pull request #692 from jnarron/havoc

Share Button works now
Using UserService to lookup user login information
Merge remote-tracking branch 'upstream/havoc' into havoc
Merge pull request #693 from hegek87/havoc

Using UserService to get User login information.
profile sidebar finished besides email.
Merge remote-tracking branch 'upstream/havoc' into havoc

Conflicts:
	src/main/webapp/WEB-INF/pages/home.jsp
	src/main/webapp/app/components/home/sidebar/SidebarView.html
	src/main/webapp/app/components/home/sidebar/SuggestionController.js
	src/main/webapp/app/shared/services/UserService.js
Merge pull request #694 from spruillkj07/havoc

completed profilesidebar except for email section
Working on Files account section
Merge remote-tracking branch 'upstream/havoc' into havoc
Finished file view
Merge pull request #695 from hegek87/havoc

Finished the Files view for the account page
start refactoring of profile sidebar
Merge remote-tracking branch 'upstream/havoc' into havoc