Merge branch 'master' into ui
styled buttons ready to merge inc new css
fixed ui merge conflict
trying to merge
Merge pull request #25 from chorus-frogs-2014/login_styled

Login styled