description changed to meet Atlassian requirements
description changed to meet Atlassian requirements
Merge branch 'master' into v1.1.0-SNAPSHOT

Conflicts:
	src/main/resources/atlassian-plugin.xml