update branch master
update branch master
update manifest and delete js unnecessary
Merge pull request #13 from marti1125/master

Master