settingslogic導入
Merge branch 'develop' into 201412081412_add_settings_logic

Conflicts:
	Gemfile
Merge branch '201412081412_add_settings_logic' into develop