new 8_23
Merge branch 'master' of https://github.com/shihweiyao/HY

Conflicts:
	app/controllers/distribution_controller.rb