ck editor, etc
0501
merge1

Merge branch 'master' of https://github.com/webtips/srsg

Conflicts:
	app/assets/javascripts/event/event.coffee
	app/cells/event/addon/dates/edit/_form.html.erb
	app/cells/event/addon/dates/edit/_show.html.erb
	app/controllers/concerns/cms/preview_filter.rb
	app/models/concerns/cms/node/model.rb
	app/models/concerns/cms/page/feature.rb
	app/views/cms/pages/_form.html.erb
	app/views/event/main/_navi.html.erb
	app/views/sns/user/files/_form.html.erb
	app/views/sns/user/temp_files/index.html.erb