Move 'currentPage' to 'currentPages' json structure and remove 'getCurrentPage' and 'setCurrentPage' methods
Merge branch 'master' into gh-pages