Adding pagination on homepage and search
Merge branch 'master' into pagination

Conflicts:
	js/app.js