Add sort by to Pages controller
Merge remote-tracking branch 'upstream/master'