Merge pull request #119 from CKHuang/master

Merge pull request #102 from jun-lu/master
update
add
update
update app.js
add
Merge pull request #120 from CKHuang/master

修改了很多
Merge pull request #104 from jun-lu/master

get update