Switch positions for crsid and college again. Added first instutition or whitespace to be displayed if no college.
Merge branch 'master' of github.com:ucam-cl-dtg/urop-2014-ticking-ui