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

修改项目显示问题
项目显示以及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
Merge pull request #55 from ProgrammerYuan/master

项目显示以及others项目显示问题修复
修复past_controllers代码错误
	原因：past_project_controllers里之前没有定义@projects变量却在Views里调用了
	modified:   app/controllers/past_projects_controller.rb
Merge pull request #57 from ProgrammerYuan/master

修复past_controllers代码错误
修复题集在登陆与未登陆情况下的显示问题
	modified:   app/views/classifies/index.html.erb
	modified:   app/views/static/home.html.haml
Merge pull request #56 from Surlavi/mobile

移动端v1.0
题集链接样式问题修改
	modified:   app/assets/stylesheets/application/classifies.css
	modified:   app/views/classifies/index.html.erb
Merge pull request #59 from ProgrammerYuan/master

修复题集在登陆与未登陆情况下的显示问题
添加调查问卷链接
	modified:   app/views/questions/_share.html.haml
Merge pull request #60 from ProgrammerYuan/Questionnaire

添加调查问卷链接
添加移动端内测帐号
	modified:   app/controllers/application_controller.rb
Merge pull request #6 from xtdz/master

Update
Merge branch 'mobile_admin'
Merge branch 'master' of https://github.com/ProgrammerYuan/dazuoxiaoti.com

Conflicts:
	app/controllers/application_controller.rb

Merge
Merge pull request #63 from ProgrammerYuan/master

添加移动端内测帐号
修复“点击下一题进入题集页，需要显示提示语言”