Large->small transition fix
Merge branch 'master' of git@github.com:ucam-cl-dtg/urop-2013-frontend.git