modified:   Gemfile.lock
Merge branch 'master' of git://github.com/jpcoymat/WMS
Merge branch 'master' of git://github.com/jpcoymat/WMS
Merge branch 'master' of git://github.com/jpcoymat/WMS
Merge branch 'master' of git://github.com/jpcoymat/WMS
Merge branch 'master' of git://github.com/jpcoymat/WMS
Merge branch 'master' of git://github.com/jpcoymat/WMS
Merge branch 'master' of git://github.com/jpcoymat/WMS
Merge branch 'master' of git://github.com/jpcoymat/WMS
Merge branch 'master' of git://github.com/jpcoymat/WMS
Merge branch 'master' of git://github.com/jpcoymat/WMS
	modified:   Gemfile.lock
Merge branch 'master' of git://github.com/jpcoymat/WMS
Merge branch 'master' of git://github.com/jpcoymat/WMS

Conflicts:
	Gemfile.lock
	modified:   Gemfile.lock
	modified:   db/schema.rb
Merge branch 'master' of git://github.com/jpcoymat/WMS

Conflicts:
	Gemfile.lock

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/admin/allocation_zones_controller.rb
	modified:   app/controllers/admin/warehouses_controller.rb
	modified:   app/controllers/application_controller.rb
	modified:   app/controllers/login_controller.rb
	modified:   app/models/allocation_strategy.rb
	modified:   app/models/allocation_strategy_line.rb
	modified:   app/models/allocation_strategy_rule.rb
	modified:   app/models/allocation_zone.rb
	modified:   app/models/assignment.rb
	modified:   app/models/assignment_detail.rb
	modified:   app/models/company.rb
	modified:   app/models/container.rb
	modified:   app/models/container_content.rb
	modified:   app/models/container_type.rb
	modified:   app/models/country.rb
	modified:   app/models/customer.rb
	modified:   app/models/customer_type.rb
	modified:   app/models/dock_door.rb
	modified:   app/models/location.rb
	deleted:    app/models/location_finder_queue.rb
	modified:   app/models/lot.rb
	modified:   app/models/order.rb
	modified:   app/models/order_line.rb
	modified:   app/models/order_type.rb
	modified:   app/models/product.rb
	modified:   app/models/product_category.rb
	modified:   app/models/product_location_assignment.rb
	modified:   app/models/product_package.rb
	modified:   app/models/product_status.rb
	modified:   app/models/product_subcategory.rb
	modified:   app/models/product_warehouse_setup.rb
	modified:   app/models/purchase_order.rb
	modified:   app/models/purchase_order_line.rb
	modified:   app/models/purchase_order_type.rb
	modified:   app/models/receipt.rb
	modified:   app/models/receipt_line.rb
	modified:   app/models/receipt_type.rb
	modified:   app/models/shipment_content.rb
	modified:   app/models/storage_strategy.rb
	modified:   app/models/storage_strategy_line.rb
	modified:   app/models/storage_strategy_rule.rb
	modified:   app/models/storage_zone.rb
	modified:   app/models/supplier.rb
	modified:   app/models/system_parameter.rb
	modified:   app/models/uom.rb
	modified:   app/models/user.rb
	modified:   app/models/warehouse.rb
	modified:   app/models/wave.rb
	modified:   app/views/admin/product_subcategories/index.html.erb
	modified:   app/views/layouts/admin.html.erb
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/layouts/main.html.erb
	modified:   app/views/login/login.html.erb
	modified:   app/views/setup/create_warehouses.html.erb
	modified:   app/views/setup/defualt_uom_setup.html.erb
	modified:   app/views/setup/index.html.erb
	modified:   app/views/setup/warehouse_users.html.erb
	modified:   config/application.rb
	modified:   config/database.yml
	modified:   config/environments/development.rb
	modified:   config/initializers/secret_token.rb
	modified:   config/routes.rb
	new file:   gcc-4.2
	deleted:    vendor/plugins/acts_as_tree/README
	deleted:    vendor/plugins/acts_as_tree/Rakefile
	deleted:    vendor/plugins/acts_as_tree/init.rb
	deleted:    vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb
	deleted:    vendor/plugins/acts_as_tree/test/abstract_unit.rb
	deleted:    vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb
	deleted:    vendor/plugins/acts_as_tree/test/database.yml
	deleted:    vendor/plugins/acts_as_tree/test/fixtures/mixin.rb
	deleted:    vendor/plugins/acts_as_tree/test/fixtures/mixins.yml
	deleted:    vendor/plugins/acts_as_tree/test/schema.rb
	deleted:    vendor/plugins/rails_upgrade/MIT-LICENSE
	deleted:    vendor/plugins/rails_upgrade/README
	deleted:    vendor/plugins/rails_upgrade/Rakefile
	deleted:    vendor/plugins/rails_upgrade/init.rb
	deleted:    vendor/plugins/rails_upgrade/install.rb
	deleted:    vendor/plugins/rails_upgrade/lib/application_checker.rb
	deleted:    vendor/plugins/rails_upgrade/lib/gemfile_generator.rb
	deleted:    vendor/plugins/rails_upgrade/lib/new_configuration_generator.rb
	deleted:    vendor/plugins/rails_upgrade/lib/rails_upgrade.rb
	deleted:    vendor/plugins/rails_upgrade/lib/routes_upgrader.rb
	deleted:    vendor/plugins/rails_upgrade/lib/tasks/rails_upgrade_tasks.rake
	deleted:    vendor/plugins/rails_upgrade/test/application_checker_test.rb
	deleted:    vendor/plugins/rails_upgrade/test/gemfile_generator_test.rb
	deleted:    vendor/plugins/rails_upgrade/test/new_configuration_generator_test.rb
	deleted:    vendor/plugins/rails_upgrade/test/routes_upgrader_test.rb
	deleted:    vendor/plugins/rails_upgrade/test/test_helper.rb
	deleted:    vendor/plugins/rails_upgrade/uninstall.rb