User home page view update
nothing specific
Merge branch 'WencongXiao-master'
Merge branch 'master' of https://github.com/YuWuLove/HCI_BUAA

Conflicts:
	HCI/db/schema.rb
Slightly Changes
sightly change
Merge remote-tracking branch 'origin/master'

Conflicts:
	HCI/app/views/layouts/application.html.erb
Update Some href