hour change bug fixed
Merge branch 'BugFixes' of github.com:ucam-cl-dtg/urop-2014-ticking-ui into BugFixes