WIP grunt tasks
merge conflict fix login.css index.html