changes made for the user authentication
origin userlogin_fix

Merge branch 'userlogin_fix' of https://github.com/BMAH07/survey into userlogin_fix
merged user fix and controller fix