security fix for will_paginate
Merge branch 'upgrade_will_paginate'

Conflicts:
	Gemfile.lock