Split and update templates#3

Merged

lucrib merged 5 commits intomasterfrom

split_templates

Dec 5, 2016

Commits on Nov 17, 2016

decouple templates from code
lucrib
committed

Commits on Nov 25, 2016

Commits on Dec 5, 2016