test zxh
Merge branch 'zxh'
ready to pull
Merge branch 'wxy'
add interface
try to add type picker, unexpected display
add type list
complete type picker
complete add act
add from text
first commit
map problem
map view test
fix map bug
update menu items
Delete test.txt
Delete haha.txt
add act list
Merge branch 'master' into showact
aa