tmp
Merge branch 'master' of https://github.com/zzfxtxcm/meifang

Conflicts:
	app/views/new_homes/index.html.haml
	db/schema.rb
更改友情链接