Merge pull request #28 from roselone/master

gui update
Merge pull request #29 from roselone/master

gui update
Merge pull request #30 from roselone/master

add old client
android record
android record
Merge pull request #31 from roselone/master

login and register
plan_record update
Merge branch 'master' of https://github.com/bxl1989/FootWith
client update gui add record and its detail
Merge pull request #46 from bxl1989/master

add record activity
fix merge
fix conflict in client.iml
Merge branch 'roselone'