Backup
Bug fix, still have bugs in js
Backup
Backup
Backup
cancel update added
Update about
Merge branch 'develope'