add icons, fix up manifest
Merge branch 'master' into dev
Merge branch 'dev' + versioning