cleanning
Merge branch 'master' of github.com:Evangenieur/TeamHome
with dynamic templating
Merge branch 'master' of github.com:Evangenieur/TeamHome