Merge remote-tracking branch 'akashkamboj/rails4'

Conflicts:
	lib/active_admin/inputs/filter_boolean_input.rb
	lib/active_admin/resource/naming.rb