Resolved merge conflict with ticker-signup. Templateing on sessionId moved up to group because of issue #12.
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2014-ticking-ui