Merge pull request #46 from bxl1989/master

add record activity
add login userinfo,add sex timestamp ,add sql patch
fix merge
fix conflict in client.iml
Merge branch 'roselone'
Merge pull request #32 from roselone/master

android gui picture and journal