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

Conflicts:
	src/main/java/uk/ac/cam/cl/dtg/teaching/FrontendServlet.java
	src/main/webapp/templates/frontend/main.soy