Fixes for grunt deploy
Merge branch 'develop' of github.com:capacity4dev/capacity4more into develop