5739141
Merge branch 'master' of https://github.com/myGrid/oauth-activity

Conflicts:
	README.md
Merge branch 'master' of https://github.com/myGrid/oauth-activity