fixed authentication bug
fixed merge conflict
fixed merge conflict
fixed merge conflict
login with ajax
fixed merge conflict