revised login and register section
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	php/resetpass.php