updating poms for 1.0.0.5-SNAPSHOT development
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state
updating poms for branch'release-1.0.0.5' with non-snapshot versions
Merge branch 'release-1.0.0.5'