Merge pull request #2 from xtdz/master

merge from master
Mobile_Admin before_filter
	修改：      app/controllers/application_controller.rb
Merge branch 'master' of https://github.com/ProgrammerYuan/dazuoxiaoti.com
修复New Admin 后台无法添加新题集的问题
	修改：      app/models/question_set.rb

说明： 由于GEM：Paperclip 版本升级带来了不支持代码原有写法的问题，目前已修复
Merge pull request #19 from ProgrammerYuan/master

Mobile Admin
修改Bug：项目无法按照设定题目上限数停止
	修改：      app/models/project.rb

修改部分：
	self.find_all_ongoing
	self.find_all_expired
	self.find_ongoing(kind=1)
	self.find_expired(kind=1)
	四个函数中的sql查询语句中关于limit的限制条件
Cancel Previous Push
	修改：      app/models/project.rb
	修改：      app/views/projects/_form_project_info.html.haml
Merge pull request #21 from ProgrammerYuan/master

修改Bug：项目无法按照设定题目上限数停止 (没问题，只是修改label）
Mobile Answering Question
	新文件：    app/controllers/mobile/questions/questions_controller.rb
	修改：      config/routes.rb
Mobile Question Answering
	修改：      app/controllers/application_controller.rb
	新文件：    app/controllers/mobile/questions_controller.rb
	修改：      app/controllers/questions_controller.rb
Delete extra folder
	删除：      app/controllers/mobile/questions/questions_controller.rb
Views of Mobile Question Answering
	新文件：    app/assets/images/projects/18/small.jpg
	新文件：    app/assets/javascripts/mobile/questions.js.coffee
	新文件：    app/assets/stylesheets/mobile/questions.css.scss.erb
	新文件：    app/assets/stylesheets/mobile/questions_left.css.scss.erb
	新文件：    app/assets/stylesheets/mobile_style.css
	新文件：    app/helpers/mobile/questions_helper.rb
	新文件：    app/views/layouts/mobile/questions/question.html.haml
	新文件：    app/views/mobile/questions/_finished.html.haml
	新文件：    app/views/mobile/questions/_jiathis.html.erb
	新文件：    app/views/mobile/questions/_linked_question.html.haml
	新文件：    app/views/mobile/questions/_new_social_link.html.erb
	新文件：    app/views/mobile/questions/_question.html.haml
	新文件：    app/views/mobile/questions/_share.html.haml
	新文件：    app/views/mobile/questions/_social_buttom_links.html.haml
	新文件：    app/views/mobile/questions/_social_links.html.haml
	新文件：    app/views/mobile/questions/next.js.erb
	新文件：    app/views/mobile/questions/show.html.haml
	新文件：    spec/controllers/mobile/questions_controller_spec.rb
	新文件：    spec/helpers/mobile/questions_helper_spec.rb
	新文件：    spec/views/mobile/questions/questions.html.erb_spec.rb
Answer Module Bug Fixing
	新文件：    app/assets/javascripts/mobile.js
	修改：      app/assets/javascripts/mobile/questions.js.coffee
	新文件：    app/assets/javascripts/mobile/remote.js.coffee.erb
	修改：      app/assets/stylesheets/mobile/questions_left.css.scss.erb
	修改：      app/controllers/application_controller.rb
	新文件：    app/controllers/mobile/answers_controller.rb
	修改：      app/controllers/mobile/questions_controller.rb
	修改：      app/controllers/questions_controller.rb
	修改：      app/views/answers/_fake.html.haml
	修改：      app/views/answers/_solution.html.haml
	修改：      app/views/layouts/mobile/questions/question.html.haml
	新文件：    app/views/mobile/answers/_fake.html.haml
	新文件：    app/views/mobile/answers/_solution.html.haml
	新文件：    app/views/mobile/answers/correct.js.erb
	新文件：    app/views/mobile/answers/fake.js.erb
	新文件：    app/views/mobile/answers/wrong.js.erb
	修改：      app/views/mobile/questions/_question.html.haml
	修改：      app/views/mobile/questions/_share.html.haml
	修改：      app/views/mobile/questions/_social_links.html.haml
	修改：      app/views/mobile/questions/next.js.erb
	修改：      app/views/mobile/questions/show.html.haml
	修改：      config/routes.rb
合并初期版本
	新文件：    app/assets/javascripts/mobile/home.js.coffee
	新文件：    app/assets/stylesheets/mobile/home.css.scss
	修改：      app/assets/stylesheets/mobile/questions_left.css.scss.erb
	修改：      app/controllers/answers_controller.rb
	修改：      app/controllers/mobile/answers_controller.rb
	新文件：    app/controllers/mobile/home_controller.rb
	修改：      app/controllers/mobile/questions_controller.rb
	修改：      app/controllers/questions_controller.rb
	修改：      app/controllers/static_controller.rb
	删除：      app/helpers/mobile/questions_helper.rb
	新文件：    app/views/layouts/mobile/mobile.html.haml
	修改：      app/views/mobile/answers/_fake.html.haml
	修改：      app/views/mobile/answers/_solution.html.haml
	新文件：    app/views/mobile/home/index.html.haml
	删除：      app/views/mobile/questions/_finished.html.haml
	删除：      app/views/mobile/questions/_jiathis.html.erb
	删除：      app/views/mobile/questions/_new_social_link.html.erb
	修改：      app/views/mobile/questions/_question.html.haml
	删除：      app/views/mobile/questions/_social_buttom_links.html.haml
	删除：      app/views/mobile/questions/_social_links.html.haml
	修改：      app/views/mobile/questions/show.html.haml
	修改：      config/routes.rb
对应trello卡片“答题、登陆功能合并”
修正了一些bug
因为有一部分逻辑和主站不同，修改了user model
恢复了登陆用户与未登录用户答题逻辑的区分

	删除：      app/assets/stylesheets/mobile/questions.css.scss.erb
	修改：      app/assets/stylesheets/mobile_style.css
	修改：      app/controllers/mobile/answers_controller.rb
	修改：      app/controllers/mobile/questions_controller.rb
	修改：      app/controllers/questions_controller.rb
	修改：      app/models/user.rb
	修改：      app/views/mobile/questions/next.js.erb
	修改：      config/routes.rb
修复上次Commit遗留的Bug
	修复 手机端网页显示问题
	modified:   app/assets/javascripts/mobile/questions.js.coffee
	modified:   app/controllers/application_controller.rb
	modified:   app/controllers/mobile/answers_controller.rb
	modified:   app/controllers/mobile/questions_controller.rb
	modified:   app/controllers/questions_controller.rb
	modified:   app/models/user.rb
	modified:   app/views/answers/correct.js.erb
	modified:   app/views/answers/fake.js.erb
	modified:   app/views/answers/wrong.js.erb
	modified:   app/views/layouts/mobile/mobile.html.haml
	modified:   app/views/layouts/mobile/questions/question.html.haml
	modified:   app/views/mobile/answers/_fake.html.haml
	modified:   app/views/mobile/answers/_solution.html.haml
	modified:   config/routes.rb
修改Mobile分支代码
	modified:   app/controllers/answers_controller.rb
	modified:   app/controllers/application_controller.rb
	modified:   app/controllers/mobile/answers_controller.rb
	deleted:    app/views/answers/_fake.html.haml
	renamed:    app/views/mobile/answers/correct.js.erb -> app/views/answers/correct.js.erb
	deleted:    app/views/answers/fake.js.erb
	renamed:    app/views/mobile/answers/wrong.js.erb -> app/views/answers/wrong.js.erb
	deleted:    app/views/mobile/answers/_fake.html.haml
	modified:   app/views/mobile/answers/_solution.html.haml
	modified:   app/views/mobile/answers/correct.js.erb
	deleted:    app/views/mobile/answers/fake.js.erb
	modified:   app/views/mobile/answers/wrong.js.erb
	deleted:    app/views/mobile/questions/_linked_question.html.haml
	modified:   app/views/mobile/questions/next.js.erb
	deleted:    spec/controllers/mobile/questions_controller_spec.rb
	deleted:    spec/helpers/mobile/questions_helper_spec.rb
	deleted:    spec/views/mobile/questions/questions.html.erb_spec.rb
Delete small.jpg
修改移动端和主站访问逻辑
	modified:   app/controllers/answers_controller.rb
	modified:   app/controllers/application_controller.rb
	modified:   app/controllers/mobile/answers_controller.rb
	modified:   app/controllers/mobile/home_controller.rb
	modified:   app/controllers/questions_controller.rb
	modified:   app/controllers/static_controller.rb
Merge branch 'mobile' of https://github.com/ProgrammerYuan/dazuoxiaoti.com into mobile