dev: map
Merge branch 'master' into map

Conflicts:
	app/models/workflow/initializer.rb
dev: map
Merge branch 'master' into map-hagukumi

Conflicts:
	app/controllers/article/pages_controller.rb
	app/controllers/cms/pages_controller.rb
	app/controllers/faq/pages_controller.rb
Merge branch 'master' into facility
dev: facility
Merge branch 'facility' of https://github.com/itowtips/srsg into facility

Conflicts:
	app/cells/cms/addons/file/edit/_form.html.erb
dev: facility
Merge branch 'master' into facility

Conflicts:
	public/assets/cms/form.js.gz
	public/assets/cms/mobile.css.gz
	public/assets/cms/public.css.gz
	public/assets/cms/public.js.gz
	public/assets/coffee-script.js.gz
	public/assets/event/form.js.gz
	public/assets/jquery.cookie.js.gz
	public/assets/jquery.js.gz
	public/assets/jquery.min.js.gz
	public/assets/jquery.turbolinks.js.gz
	public/assets/jquery.turbolinks.min.js.gz
	public/assets/jquery_ujs.js.gz
	public/assets/sns/style.css.gz
	public/assets/ss/init.css.gz
	public/assets/ss/mb.css.gz
	public/assets/ss/pc.css.gz
	public/assets/ss/ss.js.gz
	public/assets/ss/style.css
	public/assets/ss/style.css.gz
	public/assets/turbolinks.js.gz
dev: facility
Merge branch 'facility'
fix: facility locale
facility
Merge branch 'master' into facility
fix: facility temp file
fix: facility image thumb size
Merge branch 'master' into facility
facility: add tooltips
facility refactoring
facility refactoring