Modify server and add user login/reg/resetPass
merge
Merge branch 'master' of https://github.com/justplay1/hackathon