refactor for layout and language
cleanup
minor change to release script
Merge branch 'master' into releases

Conflicts:
	composer.json