My trips and login build added to grunt file
Merge branch 'master' of https://github.com/twobits-cz/este-1