Added unit tests for page calculation
Merge branch 'master' of https://github.com/Valtech-NAS/Beta
Refactored next/prev page in view model to break dependency.
Fixed js issues from last merge