Change some words into Chinese.
Merge branch 'master' of github.com:dwhuang/slap

Conflicts:
	biostar/server/templates/banners/sidebar.html
	biostar/server/templates/post_list.html
	biostar/server/templates/search/search.html
	biostar/server/templates/server_tags/nav_bar.html
	biostar/server/templates/server_tags/page_bar.html
	biostar/server/templates/server_tags/page_bar_sort_posts.html
	biostar/server/templates/server_tags/post_count_box.html
	biostar/server/templates/server_tags/search_bar.html
	biostar/server/templates/server_tags/sidebar_awards.html
	biostar/server/templates/server_tags/sidebar_locations.html
	biostar/server/templates/server_tags/sidebar_posts.html
	biostar/server/templates/server_tags/sidebar_votes.html
	biostar/server/templates/site_description.html
	biostar/server/templates/starbase.html
	biostar/server/templates/user_details.html
	biostar/server/views.py
	biostar/settings/base.py
	biostar/static/biostar2.logo.png