Merge branch 'feature_507_snippets' into feature_570_page_drafts
Merge branch 'master' into feature_507_snippets

Conflicts:
	admin/components.php
fix for multiple titles when empty title, which breaks by offsetting all components
Merge branch 'master' into feature_570_page_drafts

Conflicts:
	admin/components.php
Merge branch 'feature_570_page_drafts' into master_candidate
Merge remote-tracking branch 'remotes/origin/feature_507_snippets' into master_candidate