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
uploader0227
Merge branch 'master' into event
bin/thin, bin/egg
event0227
localization
fix: asset-url
fix: asset-url
fix: locales
rails-4.0.3 (keep jquery-rails-3.0.4)
fix: translation scope
event 0303
event 0304
event 0305
event 0305_
event 0306__
fix: public routes
event 0306
event 0307