Fixed pagination
Merge branch 'master' of github.com:rakhmatulin/hackathon14

Conflicts:
	hackathon14/views.py