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
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.