added pagination
Merge branch 'feature/pagination' into develop
Merge branch 'release/3.0'
ignored idea folder