Release/pebbles/master grizzly templates

More details are in the messages of every commit. I'm not yet done with testing but you can already have fun reviewing it :-)

And yes, this pull is currently not rebased on the others (six ATM), so I expect some further work.