add feature of upload image & update profile
User home page view update
nothing specific
update the feature of search users
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
homepage
Homepage UI change
add thumbup
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	HCI/app/views/users/show.html.erb
Add friend feature
change pwd css
HomePage