Fixed problems with comments in template.styl that prevented compilation
Adds utf-8 charset
Merge remote-tracking branch 'origin' into development

* origin:
  Adds utf-8 charset
  Fixed problems with comments in template.styl that prevented compilation