added pager option
Merge branch 'new_pager_pull' into content_as_panels

Conflicts:
	templates/includes/pagination.html