fix merge conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/functional/categories_controller_test.rb
	test/unit/category_test.rb
	test/unit/helpers/categories_helper_test.rb