Changed name and description, bumpbed version number
fixed merge conflicts from master in manifest.json