changes one by sumeet & added db backup file.
Merge branch 'master' of https://github.com/vijay99yrs/99yrs

Conflicts:
	application/config/config.php
	application/config/config.php.bak
	application/models/user_model.php