item class
Merge branch 'master' of https://github.com/kreatora3/ScorpionTeam-iOS

Conflicts:
	RoomDesigner/RoomDesigner.xcodeproj/project.pbxproj

RoomDesigner/RoomDesigner.xcodeproj/project.xcworkspace/xcuserdata/admin
.xcuserdatad/UserInterfaceState.xcuserstate