resteasy guice injection from acr31 added
urop_git project temporarily imported
Merge https://github.com/ucam-cl-dtg/urop-2014-ticking-ui

manual merge