recreate dining location entity feature
Merge branch 'master' of github.com:/ITS-UofIowa/dining.uiowa.edu

Conflicts:
	modules/features/dining_location_entity/dining_location_entity.features.field.inc