Pagination.
Black text for events.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	Gemfile.lock