deviselogin
completed devise
swamy merged conflicts resolved
new file added in properties