User, UserCollection, Sting, StingCollection
Merge remote-tracking branch 'origin/master'