123
Merge branch 'master' of https://github.com/sinkerplus/Actually

* 'master' of https://github.com/sinkerplus/Actually:
  update some functions
  update some functions
  unused js file deleted