Ignoring (and removed) *~ and .*.swp files.
Removing ETick/WebContent/WEB-INF/classes.
Removed eclipse settings and classpath files.
Removed WEB-INF/lib files.
Removed generated UROP_UI.war file, not needed.
Untracked and removed bower_components directory.
Merge remote-tracking branch 'origin/clean-up'

Conflicts:
	ETick/.settings/org.eclipse.wst.common.component
	ETick/WebContent/WEB-INF/classes/uk/ac/cam/cl/ticking/ui/actors/User.class
	ETick/WebContent/WEB-INF/classes/uk/ac/cam/cl/ticking/ui/api/GroupApiFacade.class
	ETick/WebContent/WEB-INF/classes/uk/ac/cam/cl/ticking/ui/api/TickApiFacade.class
	ETick/WebContent/WEB-INF/classes/uk/ac/cam/cl/ticking/ui/auth/RavenManager.class
Merge branch 'master' of ssh://github.com/ucam-cl-dtg/urop-2014-ticking-ui

Conflicts:
	.gitignore
	ETick/.classpath
	ETick/.settings/org.eclipse.wst.common.component