revise
Merge branch 'data2' of ssh://github.com/IbpTeam/demo-rio into data2_xiquan
merge, solve conflicts
merge
Merge branch 'data2' of ssh://github.com/IbpTeam/demo-rio into data2_xiquan
Merge branch 'data2' of ssh://github.com/IbpTeam/demo-rio into data2_xiquan
Merge branch 'data2' of ssh://github.com/IbpTeam/demo-rio into data2_xiquan
add dealing with contact
test contacts des file
Merge branch 'data2' of ssh://github.com/IbpTeam/demo-rio into data2_xiquan
modify new module for csv to json
read/write contact file success;but in unicode.
merge
add function of making contact.csv description files for each name
merge
Merge branch 'data2' of ssh://github.com/IbpTeam/demo-rio into data2_xiquan
Merge pull request #196 from shuanzi/data2_xiquan

data2_xiquan->wangfeng