event
merge, event0226

Merge branch 'master' into event

Conflicts:
	app/controllers/concerns/ss/crud_filter.rb
	app/controllers/uploader/files_controller.rb
	app/models/category/node.rb