完善页面细节
Merge remote-tracking branch 'upstream/master'

Conflicts:
	haoshimai/app/assets/css/framework.css
Merge pull request #19 from jarvys/master

完善页面细节