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

Conflicts:
	modules/150_sugon_sug/db/data/20130923224714_add_part_apply_approve_data_part1.rb
Merge branch 'sug_develop' of github.com:aronezhang/ironmine into sug_develop