Merge remote-tracking branch 'origin/development' into development
* Merge layout home template into standard layout template