Merge branch 'develop' of github.com:it-ony/gitflow into develop

Conflicts:
	pom.xml
	src/main/java/org/jenkinsci/plugins/gitflow/MyAction.java
Merge branch 'develop' of github.com:it-ony/gitflow into develop