Commented out login
Merge branch 'master' into lingjun