merge features settings
Merge branch 'master' of https://github.com/falanster/devfalanster