Merge branch 'develop' into login
wrote testLogin and implemented in login
Merge branch 'login' into develop