-
Merge commit '80b06ef54d525543d0976472c37c28fbc8b402f5'

Conflicts:
	iOS/VBEngine.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
-