Merge branch 'develop' into feature/java7
Merge branch 'develop' into feature/java7
made pom java7 ready
Merge branch 'feature/java7' into develop