gss and 318 handlebars updated
merge conflict resolved for basic plugins