Removing body field.
Merge branch 'housing-untangle-features' of github.com:bryanhirsch/Drupal4OK into housing

Conflicts:
	docroot/sites/all/modules/dr/dr.info
	docroot/sites/all/modules/dr/dr.module
	docroot/sites/all/modules/dr/dr.rules_defaults.inc
	docroot/sites/all/modules/features/help4ok_rules/help4ok_rules.info
	docroot/sites/all/modules/features/help4ok_rules/help4ok_rules.module
	docroot/sites/all/modules/features/help4ok_rules/help4ok_rules.rules_defaults.inc
	docroot/sites/all/modules/help4ok_rules/help4ok_rules.info
	docroot/sites/all/modules/help4ok_rules/help4ok_rules.module
	docroot/sites/all/modules/help4ok_rules/help4ok_rules.rules_defaults.inc
move memcache to modules folder
Hiding the display of the Driver Assigned and Geo fields.
move memcache text in settings.php
Merge pull request #63 from carsonblack/housing-untangle-features

Removing body field and hiding display of fields
Merge branch 'housing-untangle-features' of github.com:bryanhirsch/Drupal4OK into housing-untangle-features
Merge pull request #64 from riboflavin/housing-untangle-features

added google tag manager JS, contact emilie nouveau or justin dunham for...
another attempt to rename the module
Merge branch 'housing-untangle-features' of github.com:bryanhirsch/Drupal4OK into housing
Merge pull request #68 from heddn/housing

dr_rules module change