addCsv2Json-wangyu: add Csv2json function
Add annotation of api.js function.
Merge pull request #172 from wjmjimmie/br#21+jimmie

清理框架代码 #21 Add annotation of api.js function.  jimmie -> huyuanzhe
Merge branch 'master' into data2

Conflicts:
	nodewebkit/backend/api.js
	nodewebkit/backend/apiHttpHandle.js
	nodewebkit/backend/apiLocalHandle.js
	nodewebkit/backend/requestHandlers.js
Merge pull request #175 from wjmjimmie/data2

清理框架代码 #21 将master的修改merge到Data2中 jimmie -> wangfeng
revise
Merge branch 'data2' of ssh://github.com/IbpTeam/demo-rio into data2_xiquan
Fix interface bugs ,not complete
data2#153_yuanzhe:add new api
Merge pull request #176 from v11985/data2_wangfeng

Fix interface bugs ,not complete ->yuanzhe
merge, solve conflicts
data2#153_yuanzhe:merge from v11985
Merge branch 'data2' of ssh://github.com/IbpTeam/demo-rio into addCsv2Json-wangyu
Fix interface ,not complete
Merge pull request #177 from huyuanzhe/data2_yuanzhe

data2#153_yuanzhe->wangfeng
Merge pull request #178 from v11985/data2_wangfeng

Fix interface ,not complete ->yuanzhe
Merge pull request #168 from IbpTeam/addCsv2Json-wangyu

addCsv2Json-wangyu:->wangfeng
merge
Merge branch 'data2' of ssh://github.com/IbpTeam/demo-rio into data2_xiquan
Merge pull request #171 from shuanzi/data2_xiquan

data2_xiquan->wangfeng