Update plugin.php

Replace Brainstorm Media with 10up.
Update readme.txt

Replace Brainstorm Media with 10up.
Merge branch 'master' into develop

Conflicts:
	plugin.php
Merge branch 'master' into develop
Version bump
Merge branch 'r/1.1.5'