Merge branch 'hotfix/excerpt-tab-save'
Merge branch 'hotfix/preview-start-performance'
updated version numbers
Merge branch 'master' into develop

Conflicts:
	composer.json