fix gruntfile
aadd template
update template
Merge branch 'develop' into feature/template
finish template
Merge branch 'feature/template' into develop
add GA to template