Merge branch 'sug_develop' of github.com:aronezhang/ironmine into sug_develop

Conflicts:
	modules/150_sugon_sug/config/locales/zh.yml
	modules/150_sugon_sug/lib/sug/incident_request_model_ex.rb
Merge branch 'sug_develop' of github.com:aronezhang/ironmine into sug_develop

Conflicts:
	modules/150_sugon_sug/config/locales/zh.yml
	modules/150_sugon_sug/lib/sug/incident_request_model_ex.rb
Merge branch 'sug_develop' of github.com:aronezhang/ironmine into sug_develop