correct resource sorting function
Merge branch 'nj-calendar' into builds
alpha 7.1