Add Grunt, Add better logging.
Merge branch 'dev'

* dev:
  Add Grunt, Add better logging.