login-bug fixed.
login bug fixed.
merge dev to master; fix a login bug