blah
good fix
Merge branch 'master' of github.com:Chesscademy/App into francis
fix to devise login problem, spiced up the admin model a little
one more quick fix to admin