Makes it possible to update a published version to locked and blocks editing a version that is locked
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	includes/kwps_post_type.php