bug fixed
...

Conflicts:
	login.php
	transact-user.php