Edit inline with Pagination Fixed
Merge branch 'pagination_fixed' into develop
Merge branch 'develop' of github.com:ff0000/scarlet into develop