logout now in loginController
Merge branch 'master' of https://github.com/sfroestl/onespark_webapp