add prototype for reset password
Merge branch 'master' of https://github.com/vincentiusmartin/dragoonweb

Conflicts:
	application/controllers/user.php