Added context path
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2013-frontend

Conflicts:
	src/main/webapp/templates/frontend/main.soy
Added some stuff to support html 5
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2013-frontend