Fixed package.json
Merge branch 'hotfix/hotfix1'
Merge branch 'hotfix/hotfix1' into develop
Merge branch 'master' of github.com:mcranston18/foundation_htg
Merge branch 'develop'