added templates
Merge branch '2.0' of https://github.com/prestans/prestans into 2.0