Commit after fixing errors on local machine
Commit after fixing errors on local machine
Removed CR/LF using dos2unix
Merge E217: branch 'expertiza/master' into git://github.com/girishpandit88/expertiza.git

Testing not yet complete.

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/controllers/admin_controller.rb
	app/controllers/assignment_controller.rb
	app/controllers/participants_controller.rb
	app/controllers/response_controller.rb
	app/controllers/survey_deployment_controller.rb
	app/controllers/team_controller.rb
	app/controllers/tree_display_controller.rb
	config/database.yml
Updated Gemfile.lock and the database schema
Re-added Gemfile.lock from production
Merge branch 'master' into girish
Fixed a hanging def with an end