Merge branch 'release/4.0.4' Conflicts: README.md
Merge branch 'feature/theme-gem' into develop
Add example site for testing