Merge branch 'develop' into 006-theme-create
Layout category fix
Merge branch '006-theme-create' into develop