Moved uploads part of filepath from database to templates
Merge branch 'master' of
git@github.com:ucam-cl-dtg/urop-2013-questions.git

Conflicts:
	src/main/webapp/templates/shared/data.js.soy
Bugfix