pre merge
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
pre merge
manual merge