End of day commit
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2014-ticking-ui

Conflicts:
	ETick/.settings/org.eclipse.wst.common.component
	ETick/pom.xml