Using handlebars instead of grunt.template
Merge remote-tracking branch 'upstream/master'