Added docker config and fixed the Gruntfile for local deployment.
Merge remote-tracking branch 'origin/develop' into develop