Set User order property in constructor instead of class itself

The static order property caused issues when doing finds on the User
model with a different alias because 'User' would be used as name in
the find.
Merge remote-tracking branch 'cvo/master'