update to angular v1.3.2
added angular-route
added bootstrap v3.0.0 through bower
copied some assets into new dir structure
updated angular to v1.3.3
removed angular code from jsps
removed one admin email
style changes
hid x in search bar for now
started with routing (timeline view)
Merge remote-tracking branch 'upstream/havoc' into havoc

Conflicts:
	src/main/webapp/WEB-INF/pages/home.jsp
	src/main/webapp/WEB-INF/pages/includes/footer.jsp
	src/main/webapp/app/TatamiApp.js
	src/main/webapp/app/components/home/status/StatusManagerController.js
style fixes
renamed HomeView to TimelineView
copied custom(?) glyphicon fonts over to bower installed bootstrap to fix glyphicons not displaying
comment reword
GroupModule --> GroupsModule
disabled HTML5 History API, fixed timeline routing
Merge remote-tracking branch 'upstream/havoc' into havoc

Conflicts:
	src/main/webapp/app/TatamiApp.js
UserController --> ProfileController
made root url route straight to timeline