new module
Merge branch 'master' of https://github.com/falanster/devfalanster

Conflicts:
	sites/default/settings.php
Merge branch 'master' of https://github.com/falanster/devfalanster
Merge branch 'master' of https://github.com/falanster/devfalanster
new module
new module