Redesigned gridModel
Implemented restoring page and order from gridModel on initialization
Merge: master->criteria-store