added user ordering
Merge remote-tracking branch 'remotes/upstream/master' into 12771_feature_users_ordering
fix fixtures
fix method name
Merge pull request #79 from lensky84/12771_feature_users_ordering

added user ordering