county distriction modified 2014/7/23
Merge branch 'master' of https://github.com/shihweiyao/HY

Conflicts:
	config/routes.rb
	db/schema.rb
county distriction modified 2014/7/23