gitignore update
fix templatecache issue
grunt serve dist setup
Merge remote-tracking branch 'origin/master'