Merge branch 'release/v1.1'
Add file template/default.html in manifest
Merge branch 'hotfix/#31' into develop