layout
commit
Merge branch 'hotfix/1.0.0' into develop

Conflicts:
	.htaccess
Merge branch 'hotfix/1.0.0' into develop
Merge branch 'feature/StartFrontEnd' into develop
Merge branch 'release/1.0.1'

Conflicts:
	.htaccess