Changed asthetics, changed launcher activity to login
Merge branch 'master' of https://github.com/twuster/BlueprintHack
fixed merge conflicts