Updating manifest to point to correct icon
Replace icons with new artifacts
Merge pull request #760 from bhariharan/master

Replacing icons with new artifacts
Merge branch 'master' into unstable
Merge pull request #761 from bhariharan/unstable

Merge branch 'master' into unstable