updating poms for 3.1.0-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
merge from master
pom cleanup.
version.
prosper version.
prosper version update.
version.
site updates.
Merge branch 'feature-documentation-updates' into develop

Conflicts:
	bedrock-api/pom.xml
	bedrock-core/pom.xml
	bedrock-ui/pom.xml
	pom.xml
prosper version update.
updating poms for branch '3.0.1' with snapshot versions
updating poms for branch'release-3.0.1' with non-snapshot versions
Merge branch 'release-3.0.1'