add grunt for build
reset
add gitignore
Merge remote-tracking branch 'remotes/origin/dev-adv-templates'