Class Hierarchy update

Slight change to User and adding the Halls utility class
Merge branch 'master' of https://github.com/Yuncun/SwipesExchange

Conflicts:
	SwipesExchange/Bruin
Swipes.xcodeproj/project.xcworkspace/xcuserdata/mcdecoste.xcuserdatad/Us
erInterfaceState.xcuserstate