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