Nov. 30, 2012 Expertiza Submission
Dec. 3, modifications based on demo feedback
Restore line endings to match original
Merge branch 'master' into E713-custom-rubric

* master: (303 commits)
  minor edits to timezone dropdown
  set the current user id to the admin's user id so the new users created will have the same prefered time zone as admins by default
  New column timezonepref to user table
  New Dropdown added in profile page of users to set preferred time zone
  defined a function to set the current user's time zone
  Added bundler support
  Fixed a hanging def with an end
  Re-added Gemfile.lock from production
  Updated Gemfile.lock and the database schema
  Removed CR/LF using dos2unix
  updated wip profile
  Added a usage formatter profile. Please note that you have to run rake task db:test:prepare before using this profile
  refactored create_course_node
  Show the CodeClimate GPA on the project page
  Show off the passing test suite (!!!) with the Travis banner
  refactored create_course_node
  removed debugging output
  run test rake task
  bundle run cucumber instead of cucumber rake task
  specified cucumber profile with shorthand line argument
  ...

Conflicts:
	.gitignore
	app/views/questionnaire/_scripts.html.erb
	app/views/questionnaire/edit_advice.html.erb
	app/views/questionnaire/view.html.erb
	app/views/tree_display/actions/_assignments_folder_actions.html.erb
	app/views/tree_display/actions/_courses_folder_actions.html.erb
	app/views/tree_display/actions/_shared_actions.html.erb
	db/goldberg_db_postgresql.sql
	db/migrate/043_update_review_of_review_mappings.rb
	db/migrate/060_menu_update_tree_display.rb
	public/javascripts/application.js
	test/fixtures/nodes.yml
	test/fixtures/question_types.yml
	test/functional/questionnaire_controller_test.rb
update ignored directories
Removed Inactive/useless link
Modified delete selected question button to delete correct questions.
Merge branch 'E713-custom-rubric' into master from Fall 2012 Final Project https://github.com/dmcarmon/expertiza_final
* E713-custom-rubric:
  Modified delete selected question button to delete correct questions.
  Removed Inactive/useless link
  update ignored directories
  Restore line endings to match original
  Dec. 3, modifications based on demo feedback
  Nov. 30, 2012 Expertiza Submission
Merge pull request #265 from expertiza/E713-custom-rubric

E713 custom rubric from Fall 2012 https://github.com/dmcarmon/expertiza_final
Import button placement was confusing. Should come after choose file since a file has to be selected first
Changes to edit questionnaire view
* 'master' of https://github.com/expertiza/expertiza:
Added capybara and .orig files
email support list instead of @pamo :grin:
Added missing end