Mark the TODO to remove the noconflict
Use the aliased method name
Merge branch 'master' into redesign

Conflicts:
	app/controllers/admin/contacts_controller.rb
	app/controllers/admin/events_controller.rb
	app/controllers/admin/posts_controller.rb
	config/initializers/kaminari.rb
Fix pagination