update login script
Merge remote-tracking branch 'origin/test_nao' into test_nao

Conflicts:
	logout.php
	register.php
	tairu-config.php