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

Conflicts:
	modules/150_sugon_sug/config/routes.rb