new style warning
bump version
Merge branch 'master' of https://github.com/Rhaptos/Products.RhaptosContent

Conflicts:
	Products/RhaptosContent/CHANGES.txt
	Products/RhaptosContent/version.txt