Add screenshot and update description
Update screenshot URL
Merge remote-tracking branch 'upstream/master'

Conflicts:
	packages.json
Merge pull request #195 from zenangst/master

Add screenshot and update description on Marvin plugin