changed paginate_by to 15
Merge branch 'master2'