better handling of reverting from draft to published
cleanup of PHPDoc
Merge branch 'refs/heads/master' into upgrade_2.3

Conflicts:
	Entity/ContentRoute.php
initial separation from entity and model to prepare for use with different db setups