Merge branch 'develop'
Merge branch 'release/0.2.0'
Merge branch 'develop'
* fix: config/local.js now accepts our patches.
0.3.1
Merge branch 'hotfix/sails10.4ConfigChanges' into develop
* removed testing changes