updating poms for fkdjs version
updating poms for test_2 version
merging 'feature/test2' into develop
Merge branch 'feature/fkdjs' into develop
merging 'feature/fkdjs' into develop
Merge branch 'release/1.0' into develop

Conflicts:
	pom.xml
Merge branch 'release/1.0' into develop
updating poms for 1.1-SNAPSHOT development
updating poms for 1.1 release
Merge branch 'release/1.1'