Eugene Simakin Merge branch 'feature/show-total-pages-#23' into develop
7a26fba Nov 7, 2015
Merge branch 'feature/show-total-pages-#23' into develop 
# Conflicts:
#	jquery.twbsPagination.min.js
7a26fba