出于共享目的的commit
Merge remote-tracking branch 'lzy/mobile' into mobile
移动端初版
移动端v1.0
一些修正（主要是项目显示逻辑
bug fix
bug fix
bug fix
Merge branch 'master' into mobile
Merge remote-tracking branch 'upstream/master' into mobile

Conflicts:
	app/assets/javascripts/mobile.js
	app/assets/stylesheets/mobile_style.css
	app/views/mobile/questions/show.html.haml
	app/views/projects/_form_project_info.html.haml
bug fix
bug fix
bug fix
Merge pull request #52 from Surlavi/master

修正dashboard bug
Merge pull request #5 from xtdz/master

Update
修改项目显示问题
	modified:   app/views/questions/_question.html.haml
Merge pull request #53 from ProgrammerYuan/master

修改项目显示问题
bug fix
项目显示以及others项目显示问题修复
	将unit_rate从Benefits 移动到了 Projects，并修改相应form中的输入项
	修改Project Model的SQL调用判断条件
	修改部分find_ongoing 为 find_all_ongoing
	修改others传入参数@projects：改为@projects[0,4]，即选取前四个
	modified:   app/controllers/application_controller.rb
	modified:   app/controllers/projects_controller.rb
	modified:   app/models/project.rb
	modified:   app/views/answers/_solution.html.haml
	modified:   app/views/benefits/_benefits_form_field.html.haml
	modified:   app/views/dashboard/main.html.haml
	modified:   app/views/mobile/questions/_question.html.haml
	modified:   app/views/past_projects/show.html.haml
	modified:   app/views/projects/_form_basic_info.html.haml
	modified:   app/views/projects/show.html.haml
	modified:   app/views/questions/_question.html.haml
	modified:   app/views/questions/show.html.haml
	new file:   db/migrate/20140611070216_move_unit_rate_to_project_domain.rb
bug fix
Merge pull request #55 from ProgrammerYuan/master

项目显示以及others项目显示问题修复