Adding field bases feature and taking them out of the other features
Merge branch 'prod'

Conflicts:
	modules/features/residency_events/residency_events.info