fix img src
Merge branch 'master' of github.com:IbpTeam/demo-rio
Merge branch 'master' of github.com:IbpTeam/demo-rio
add data in videos and change dao struct
Merge branch 'master' of github.com:IbpTeam/demo-rio
add video
Merge branch 'master' of github.com:IbpTeam/demo-rio
fix browser.js for new api
Combine get contacts and others API
Merge branch 'master' of github.com:IbpTeam/demo-rio

Conflicts:
	nodewebkit/index.html
fix some bugs in db
clean contacts and pictures table in db
Syncdb from local folder
modify resource folder
File server for absolute path
add file-explorer.
add API loadResources
Merge branch 'master' of github.com:IbpTeam/demo-rio
Modify API loadResources's description
add API rmDataById with part function for delete in db , which cannot delete real file by far.