a lot of updates
Merge branch 'master' of https://github.com/HuberyDu/bancheng

Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/index.html.haml
	app/views/projects/show.html.haml