merged
Merge branch 'master' of https://github.com/Philhawk/desker
apply bootstrap to login and fix login