From Mac
connect
Merge branch 'master' of github.com:BenWicke/costrecovery-post

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.rdoc
	Rakefile
	app/assets/images/LexingtonFire.png
	app/assets/images/eastwood.png
	app/assets/images/greendale.png
	app/assets/images/headerbg.jpg
	app/assets/images/irstlogo-black.png
	app/assets/images/irstlogo.png
	app/assets/images/jtown.png
	app/assets/images/new.png
	app/assets/images/rails.png
	app/assets/images/zoneton.png
	app/assets/javascripts/application.js
	app/assets/javascripts/controls.js
	app/assets/javascripts/dragdrop.js
	app/assets/javascripts/effects.js
	app/assets/javascripts/jquery-1.4.2.min.js
	app/assets/javascripts/prototype.js
	app/assets/javascripts/rails.js
	app/assets/stylesheets/.gitkeep
	app/assets/stylesheets/application.css
	app/assets/stylesheets/scaffold.css
	app/assets/stylesheets/style.css
	app/controllers/application_controller.rb
	app/controllers/command_officers_controller.rb
	app/controllers/command_vehicles_controller.rb
	app/controllers/emergency_supports_controller.rb
	app/controllers/emts_controller.rb
	app/controllers/engines_controller.rb
	app/controllers/field_units_controller.rb
	app/controllers/fire_chiefs_controller.rb
	app/controllers/fire_fighters_controller.rb
	app/controllers/hazmat_specialists_controller.rb
	app/controllers/hazmat_units_controller.rb
	app/controllers/incidents_controller.rb
	app/controllers/ladder_truck150s_controller.rb
	app/controllers/ladder_truck75s_controller.rb
	app/controllers/mat_lists_controller.rb
	app/controllers/profiles_controller.rb
	app/controllers/pumpers_controller.rb
	app/controllers/rescue_units_controller.rb
	app/controllers/safety_officers_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/tankers_controller.rb
	app/controllers/timesheets_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/helpers/command_officers_helper.rb
	app/helpers/command_vehicles_helper.rb
	app/helpers/em_ts_helper.rb
	app/helpers/emergency_supports_helper.rb
	app/helpers/engines_helper.rb
	app/helpers/field_units_helper.rb
	app/helpers/fire_chiefs_helper.rb
	app/helpers/fire_fighters_helper.rb
	app/helpers/hazmat_specialists_helper.rb
	app/helpers/hazmat_units_helper.rb
	app/helpers/incident_helper.rb
	app/helpers/incidents_helper.rb
	app/helpers/ladder_truck150s_helper.rb
	app/helpers/ladder_truck75s_helper.rb
	app/helpers/mat_lists_helper.rb
	app/helpers/profiles_helper.rb
	app/helpers/pumpers_helper.rb
	app/helpers/rescue_units_helper.rb
	app/helpers/safety_officers_helper.rb
	app/helpers/sessions_helper.rb
	app/helpers/tankers_helper.rb
	app/helpers/timesheets_helper.rb
	app/helpers/users_helper.rb
	app/mailers/.gitkeep
	app/mailers/notifier.rb
	app/mailers/pass_reset.rb
	app/models/.gitkeep
	app/models/command_officer.rb
	app/models/command_vehicle.rb
	app/models/emergency_support.rb
	app/models/emt.rb
	app/models/engine.rb
	app/models/field_unit.rb
	app/models/fire_chief.rb
	app/models/fire_fighter.rb
	app/models/hazmat_specialist.rb
	app/models/hazmat_unit.rb
	app/models/incident.rb
	app/models/ladder_truck150.rb
	app/models/ladder_truck75.rb
	app/models/mat_list.rb
	app/models/profile.rb
	app/models/pumper.rb
	app/models/rescue_unit.rb
	app/models/safety_officer.rb
	app/models/tanker.rb
	app/models/timesheet.rb
	app/models/user.rb
	app/views/command_officers/_editform.html.erb
	app/views/command_officers/_form.html.erb
	app/views/command_officers/edit.html.erb
	app/views/command_officers/new.html.erb
	app/views/command_officers/show.html.erb
	app/views/command_vehicles/_editform.html.erb
	app/views/command_vehicles/_form.html.erb
	app/views/command_vehicles/edit.html.erb
	app/views/command_vehicles/new.html.erb
	app/views/command_vehicles/show.html.erb
	app/views/emergency_supports/_editform.html.erb
	app/views/emergency_supports/_form.html.erb
	app/views/emergency_supports/edit.html.erb
	app/views/emergency_supports/new.html.erb
	app/views/emergency_supports/show.html.erb
	app/views/emts/_editform.html.erb
	app/views/emts/_form.html.erb
	app/views/emts/edit.html.erb
	app/views/emts/new.html.erb
	app/views/emts/show.html.erb
	app/views/engines/_editform.html.erb
	app/views/engines/_form.html.erb
	app/views/engines/edit.html.erb
	app/views/engines/new.html.erb
	app/views/engines/show.html.erb
	app/views/field_units/_editform.html.erb
	app/views/field_units/_form.html.erb
	app/views/field_units/edit.html.erb
	app/views/field_units/new.html.erb
	app/views/field_units/show.html.erb
	app/views/fire_chiefs/_editform.html.erb
	app/views/fire_chiefs/_form.html.erb
	app/views/fire_chiefs/edit.html.erb
	app/views/fire_chiefs/new.html.erb
	app/views/fire_chiefs/show.html.erb
	app/views/fire_fighters/_editform.html.erb
	app/views/fire_fighters/_form.html.erb
	app/views/fire_fighters/edit.html.erb
	app/views/fire_fighters/new.html.erb
	app/views/fire_fighters/show.html.erb
	app/views/hazmat_specialists/_editform.html.erb
	app/views/hazmat_specialists/_form.html.erb
	app/views/hazmat_specialists/edit.html.erb
	app/views/hazmat_specialists/new.html.erb
	app/views/hazmat_specialists/show.html.erb
	app/views/hazmat_units/_editform.html.erb
	app/views/hazmat_units/_form.html.erb
	app/views/hazmat_units/edit.html.erb
	app/views/hazmat_units/new.html.erb
	app/views/hazmat_units/show.html.erb
	app/views/incidents/_form.html.erb
	app/views/incidents/_status.html.erb
	app/views/incidents/changestatus.html.erb
	app/views/incidents/edit.html.erb
	app/views/incidents/index.html.erb
	app/views/incidents/new.html.erb
	app/views/incidents/show.html.erb
	app/views/ladder_truck150s/_editform.html.erb
	app/views/ladder_truck150s/_form.html.erb
	app/views/ladder_truck150s/edit.html.erb
	app/views/ladder_truck150s/index.html.erb
	app/views/ladder_truck150s/new.html.erb
	app/views/ladder_truck150s/show.html.erb
	app/views/ladder_truck75s/_editform.html.erb
	app/views/ladder_truck75s/_form.html.erb
	app/views/ladder_truck75s/edit.html.erb
	app/views/ladder_truck75s/index.html.erb
	app/views/ladder_truck75s/new.html.erb
	app/views/ladder_truck75s/show.html.erb
	app/views/layouts/application.html.erb
	app/views/mat_lists/_form.html.erb
	app/views/mat_lists/edit.html.erb
	app/views/mat_lists/index.html.erb
	app/views/mat_lists/new.html.erb
	app/views/mat_lists/show.html.erb
	app/views/notifier/send_notice.text.erb
	app/views/pass_reset/send_new_pass.text.erb
	app/views/profiles/_form.html.erb
	app/views/profiles/edit.html.erb
	app/views/profiles/index.html.erb
	app/views/profiles/new.html.erb
	app/views/profiles/show.html.erb
	app/views/pumpers/_editform.html.erb
	app/views/pumpers/_form.html.erb
	app/views/pumpers/edit.html.erb
	app/views/pumpers/new.html.erb
	app/views/pumpers/show.html.erb
	app/views/rescue_units/_editform.html.erb
	app/views/rescue_units/_form.html.erb
	app/views/rescue_units/edit.html.erb
	app/views/rescue_units/new.html.erb
	app/views/rescue_units/show.html.erb
	app/views/safety_officers/_editform.html.erb
	app/views/safety_officers/_form.html.erb
	app/views/safety_officers/edit.html.erb
	app/views/safety_officers/new.html.erb
	app/views/safety_officers/show.html.erb
	app/views/sessions/new.html.erb
	app/views/sessions/resetpass.html.erb
	app/views/tankers/_editform.html.erb
	app/views/tankers/_form.html.erb
	app/views/tankers/edit.html.erb
	app/views/tankers/new.html.erb
	app/views/tankers/show.html.erb
	app/views/timesheets/_form.html.erb
	app/views/timesheets/edit.html.erb
	app/views/timesheets/index.html.erb
	app/views/timesheets/new.html.erb
	app/views/timesheets/show.html.erb
	app/views/users/_form.html.erb
	app/views/users/edit.html.erb
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	config.ru
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/en.yml
	config/routes.rb
	db/migrate/20101029190037_create_users.rb
	db/migrate/20101029190243_create_profiles.rb
	db/migrate/20101029193337_create_incidents.rb
	db/migrate/20101029203851_add_status_to_incidents.rb
	db/migrate/20101103141732_add_sessions_table.rb
	db/migrate/20101103143512_rename_password_to_hashed_password.rb
	db/migrate/20101103144654_add_user_id_to_incidents.rb
	db/migrate/20101112173840_add_admin_to_users.rb
	db/migrate/20101117211115_create_timesheets.rb
	db/migrate/20101117212822_create_command_officers.rb
	db/migrate/20101117212847_create_fire_chiefs.rb
	db/migrate/20101117212910_create_fire_fighters.rb
	db/migrate/20101117212929_create_safety_officers.rb
	db/migrate/20101117212947_create_emts.rb
	db/migrate/20101117213008_create_hazmat_specialists.rb
	db/migrate/20101117213233_create_command_vehicles.rb
	db/migrate/20101117213250_create_engines.rb
	db/migrate/20101117213317_create_emergency_supports.rb
	db/migrate/20101117213335_create_hazmat_units.rb
	db/migrate/20101117213353_create_field_units.rb
	db/migrate/20101117213410_create_pumpers.rb
	db/migrate/20101117213432_create_tankers.rb
	db/migrate/20101117213454_create_rescue_units.rb
	db/migrate/20101118191633_change_datatypes_personnel.rb
	db/migrate/20101118195511_change_datatype_totalhours.rb
	db/migrate/20110111190901_create_mat_lists.rb
	db/migrate/20110118160145_rename_mat_list_ref.rb
	db/migrate/20110303153934_add_details_to_incident.rb
	db/migrate/20110406171312_add_log_to_users.rb
	db/migrate/20121004144823_add_report_nr_to_safety_officers.rb
	db/migrate/20121004183453_add_report_nr_to_fire_fighters.rb
	db/migrate/20121005150006_add_report_nr_to_command_officers.rb
	db/migrate/20121008133844_add_report_nr_to_fire_chiefs.rb
	db/migrate/20121008141137_add_report_nr_to_emts.rb
	db/migrate/20121008152804_add_report_nr_to_command_vehicles.rb
	db/migrate/20121008172637_add_report_nr_to_emergency_supports.rb
	db/migrate/20121008174659_add_report_nr_to_engines.rb
	db/migrate/20121008183010_add_report_nr_to_field_units.rb
	db/migrate/20121008190131_add_report_nr_to_hazmat_specialists.rb
	db/migrate/20121008193151_add_report_nr_to_hazmat_units.rb
	db/migrate/20121008200057_add_report_nr_to_pumpers.rb
	db/migrate/20121008201956_add_report_nr_to_rescue_units.rb
	db/migrate/20121008204114_add_report_nr_to_tankers.rb
	db/migrate/20121009121924_add_report_nr_to_mat_lists.rb
	db/migrate/20121109161046_create_ladder_truck75s.rb
	db/migrate/20121109194053_create_ladder_truck150s.rb

db/migrate/20121128202912_add_stay_and_stay_am_and_soda_and_soda_am_to_m
at_lists.rb

db/migrate/20121218193205_add_strike_and_strike_am_and_wtr_polymers_and_
wtr_polymers_am_to_mat_lists.rb
	db/migrate/20131021144932_add_acid_and_acid_am_to_mat_lists.rb
	db/schema.rb
	db/seeds.rb
	doc/README_FOR_APP
	lib/assets/.gitkeep
	lib/csv_import/command_officers.csv
	lib/csv_import/command_vehicles.csv
	lib/csv_import/emergency_supports.csv
	lib/csv_import/emts.csv
	lib/csv_import/engines.csv
	lib/csv_import/field_units.csv
	lib/csv_import/fire_chiefs.csv
	lib/csv_import/fire_fighters.csv
	lib/csv_import/hazmat_specialists.csv
	lib/csv_import/hazmat_units.csv
	lib/csv_import/incidents.csv
	lib/csv_import/ladder_truck150.csv
	lib/csv_import/ladder_truck75.csv
	lib/csv_import/mat_lists.csv
	lib/csv_import/pumpers.csv
	lib/csv_import/rescue_units.csv
	lib/csv_import/safety_officers.csv
	lib/csv_import/tankers.csv
	lib/csv_import/timesheets.csv
	lib/tasks/.gitkeep
	lib/tasks/combine_csv.rake
	lib/tasks/import_command_officers_csv.rake
	lib/tasks/import_command_vehicles_csv.rake
	lib/tasks/import_emergency_supports_csv.rake
	lib/tasks/import_emts_csv.rake
	lib/tasks/import_engines_csv.rake
	lib/tasks/import_field_units_csv.rake
	lib/tasks/import_fire_chiefs_csv.rake
	lib/tasks/import_fire_fighters_csv.rake
	lib/tasks/import_hazmat_specialists_csv.rake
	lib/tasks/import_hazmat_units_csv.rake
	lib/tasks/import_incidents_csv.rake
	lib/tasks/import_ladder_truck150_csv.rake
	lib/tasks/import_ladder_truck75_csv.rake
	lib/tasks/import_mat_lists_csv.rake
	lib/tasks/import_pumpers_csv.rake
	lib/tasks/import_rescue_units_csv.rake
	lib/tasks/import_safety_officers_csv.rake
	lib/tasks/import_tankers_csv.rake
	lib/tasks/import_timesheets_csv.rake
	log/.gitkeep
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/images/LexingtonFire.png
	public/images/eastwood.png
	public/images/greendale.png
	public/images/headerbg.jpg
	public/images/irstlogo-black.png
	public/images/irstlogo.png
	public/images/jtown.png
	public/images/new.png
	public/images/rails.png
	public/images/zoneton.png
	public/javascripts/application.js
	public/javascripts/controls.js
	public/javascripts/dragdrop.js
	public/javascripts/effects.js
	public/javascripts/jquery-1.4.2.min.js
	public/javascripts/prototype.js
	public/javascripts/rails.js
	public/robots.txt
	public/stylesheets/.gitkeep
	public/stylesheets/application.css
	public/stylesheets/scaffold.css
	public/stylesheets/style.css
	push_201304042128.dat
	push_201304042139.dat
	push_201304091630.dat
	push_201304091651.dat
	push_201304101932.dat
	push_201304111852.dat
	push_201304111904.dat
	push_201304112109.dat
	script/rails
	test/fixtures/.gitkeep
	test/functional/.gitkeep
	test/integration/.gitkeep
	test/performance/browsing_test.rb
	test/test_helper.rb
	test/unit/.gitkeep
	vendor/assets/javascripts/.gitkeep
	vendor/assets/stylesheets/.gitkeep
	vendor/plugins/.gitkeep