Preparing for server deployment - works at localhost now.
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2014-signup

Conflicts:
	public/pom.xml