Stop jshint moaning about curly braces
Merge remote-tracking branch 'origin/dev' into dev

* origin/dev:
  Fixing lint error for grunt deploy