Refacto#3

Open

4nth0 wants to merge 2 commits intosimpulton:masterfrom

4nth0:master

Commits on Apr 18, 2015

return template directly from the templates object instead of switch / case
4nth0
committed
TemplateService refacto to have more reusable service
4nth0
committed