user name from databse checked
Merge branch 'master' of https://github.com/infotechnab/Reservation

Conflicts:
	application/controllers/login.php