Merge dev-master
add
create Team
list Team
Merge branch 'templating' of https://github.com/itdoors/sd into templating
Merge templating