further bean work
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
further bean work
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
updated package structure
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
fixed null crsid
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui
Merge branch 'master' of https://github.com/ucam-cl-dtg/urop-2014-ticking-ui