Merge branch 'ios-users' of ssh://github.com/box/box-ios-sdk-v2 into ios-users
Merge branch 'ios-users' of ssh://github.com/box/box-ios-sdk-v2 into ios-users

Conflicts:
	BoxSDK/Models/BoxUser.m