updating poms for 0.2.1-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
gitignored pom.xml.versionsBackup

Change-Id: I1480ecf41b4cb981a0ff18a1841343c7b2ba066b