Updated pom.xml to reflect refactoring
Merge branch 'web-api' of github.com:ucam-cl-dtg/urop-2014-git into web-api

ecially if it merges an updated upstream into a topic branch.