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
Changing versions to 1.2.0-SNAPSHOT
Merge remote-tracking branch 'upstream/v1.2.0-SNAPSHOT' into
v1.2.0-SNAPSHOT

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