Merge branch 'release/1.5' into develop
updating poms for next development version
Merge branch 'master' into develop

Conflicts:
	pom.xml
next dev version
new featutre
switching gitflow plugin to atlasian
Revert "new featutre"

This reverts commit 170934b63ea1c81eb9397544b105b810d6697dd4.
Revert "switching gitflow plugin to atlasian"

This reverts commit dcd481c989234f5d39bad83520638911e509d8ec.
duplicate .gitignore
removed
NFON version
updating poms for release
Merge branch 'release/1.6'