login page ,initial password check
register page done
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/_header.php
_header.php fix
Merge remote-tracking branch 'origin/master'