renamed views/default/user.html -> views/default/login.html
Merge branch 'master' of https://github.com/apoorvemohan/newbaadal