Changes
Merge branch 'master' of github.com:cuberob/Hackathon2014

t push# By Steven
* 'master' of github.com:cuberob/Hackathon2014:
  Fixed login after logout