Merge branch 'feature/show-total-pages-#23' into develop …
# Conflicts: # jquery.twbsPagination.min.js