Merge branch 'hotfix/1.1.20'
Merge branch 'release/0.1.3'
In attempt to help resolve merge conflicts I am adding the pom to merge strategy theirs...
Added jgitflow-maven-plugin. #29
Added configuration for jgitflow-maven-plugin. #29
Removed TODO documentation as I had created ~/.m2/settings.xml file to be able to use jgit-flow-plugin.
Fixed invalid plugin configuration for jgitflow-maven-plugin. #29
Merge branch 'feature/jgit-flow-plugin' into develop
Fixed jgitflow-maven-plugin configuration. #29
updating poms for branch'release/0.1.4' with non-snapshot versions
updating poms for 0.1.5-SNAPSHOT development
Errored when running mvn jgitflow:release-finish

Hopefully this is a fix...
Merge branch 'release/0.1.4'
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state
Fixing some warnings for unspecified org.apache.maven.plugins versions.
Merge pull request #31 from virtuoushub/develop

0.1.5-SNAPSHOT