Move site generator into its own project to be able to use a distinct version of Groovy
Use layout inheritance (Groovy 2.3.4)
Fix merge glitches
Further simplification of templates thanks to layout model inheritance