Add back the LocationType field to Location as a way to categorize named locations (i.e. campus, building, room)
Merge branch 'origin/develop'