modified:   app/controllers/map_controller.rb
	modified:   app/controllers/workobjects_controller.rb
	modified:   app/views/map/index.html.erb

	modified:   app/controllers/map_controller.rb
	modified:   app/controllers/tasks_controller.rb
	modified:   app/controllers/workobjects_controller.rb
	modified:   app/views/map/index.html.erb
	modified:   app/views/staffs/_form.html.erb
	modified:   app/views/staffs/edit.html.erb
	modified:   app/views/staffs/index.html.erb
	modified:   app/views/staffs/show.html.erb
	modified:   app/views/tasks/_form.html.erb
	modified:   app/views/tasks/edit.html.erb
	modified:   app/views/tasks/index.html.erb
	modified:   app/views/tasks/new.html.erb
	modified:   app/views/tasks/show.html.erb
	modified:   app/views/workobjects/_form.html.erb
	modified:   app/views/workobjects/edit.html.erb
	modified:   app/views/workobjects/index.html.erb
	modified:   app/views/workobjects/new.html.erb
	modified:   app/views/workobjects/show.html.erb
	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/staffs_controller.rb
	modified:   app/controllers/tasks_controller.rb
	modified:   app/controllers/workobjects_controller.rb
	modified:   app/models/staff.rb
	modified:   app/models/staff_task_journal.rb
	modified:   app/models/task.rb
	modified:   app/models/workobject.rb
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/map/index.html.erb
	modified:   app/views/staff_task_journals/_form.html.erb
	modified:   app/views/staff_task_journals/index.html.erb
	modified:   app/views/staff_task_journals/show.html.erb
	modified:   app/views/staffs/_form.html.erb
	modified:   app/views/staffs/index.html.erb
	modified:   app/views/staffs/show.html.erb
	modified:   app/views/tasks/_form.html.erb
	modified:   app/views/tasks/index.html.erb
	modified:   app/views/tasks/show.html.erb
	modified:   app/views/workobjects/index.html.erb
	modified:   app/views/workobjects/show.html.erb
	modified:   config/application.rb
	modified:   config/database.yml
	modified:   config/routes.rb
	modified:   db/schema.rb
	deleted:    public/index.html
	app/assets/javascripts/data_files.js.coffee
	app/assets/javascripts/uploads.js.coffee
	app/assets/stylesheets/custom.css.scss
	app/assets/stylesheets/data_files.css.scss
	app/assets/stylesheets/uploads.css.scss
	app/controllers/data_files_controller.rb
	app/controllers/uploads_controller.rb
	app/helpers/data_files_helper.rb
	app/helpers/uploads_helper.rb
	app/models/data_file.rb
	app/models/upload.rb
	app/views/data_files/
	app/views/staffs/_tasks.html.erb
	app/views/tasks/_staff.html.erb
	app/views/uploads/
	app/views/workobjects/_tasks.html.erb
	db/migrate/20130821201114_create_uploads.rb
	db/migrate/20130822172716_fix_column_name.rb
	db/migrate/20130826161821_create_data_files.rb
	db/migrate/20130826190437_add_col_upload.rb
	public/assets/
	test/fixtures/data_files.yml
	test/fixtures/uploads.yml
	test/functional/data_files_controller_test.rb
	test/functional/uploads_controller_test.rb
	test/unit/data_file_test.rb
	test/unit/helpers/data_files_helper_test.rb
	test/unit/helpers/uploads_helper_test.rb
	test/unit/upload_test.rb
	uploads/
Merge branch 'master' of https://github.com/unixlamaster/erp_base

Conflicts:
	app/views/map/index.html.erb
	new file:   app/assets/javascripts/data_files.js.coffee
	new file:   app/assets/javascripts/uploads.js.coffee
	new file:   app/assets/stylesheets/custom.css.scss
	new file:   app/assets/stylesheets/data_files.css.scss
	new file:   app/assets/stylesheets/uploads.css.scss
	new file:   app/controllers/data_files_controller.rb
	new file:   app/controllers/uploads_controller.rb
	new file:   app/helpers/data_files_helper.rb
	new file:   app/helpers/uploads_helper.rb
	new file:   app/models/data_file.rb
	new file:   app/models/upload.rb
	new file:   app/views/data_files/_form.html.erb
	new file:   app/views/data_files/edit.html.erb
	new file:   app/views/data_files/index.html.erb
	new file:   app/views/data_files/new.html.erb
	new file:   app/views/data_files/old_form.html.erb
	new file:   app/views/data_files/show.html.erb
	new file:   app/views/staffs/_tasks.html.erb
	new file:   app/views/tasks/_staff.html.erb
	new file:   app/views/uploads/_form.html.erb
	new file:   app/views/uploads/edit.html.erb
	new file:   app/views/uploads/index.html.erb
	new file:   app/views/uploads/index.html.erb-OLD
	new file:   app/views/uploads/new.html.erb
	new file:   app/views/uploads/show.html.erb
	new file:   app/views/workobjects/_tasks.html.erb
	new file:   db/migrate/20130821201114_create_uploads.rb
	new file:   db/migrate/20130822172716_fix_column_name.rb
	new file:   db/migrate/20130826161821_create_data_files.rb
	new file:   db/migrate/20130826190437_add_col_upload.rb
	new file:   public/assets/_bootstrap-52dcdf6b64ed5dbbab5ee91ba4cee718.css
	new file:   public/assets/_bootstrap-52dcdf6b64ed5dbbab5ee91ba4cee718.css.gz
	new file:   public/assets/_bootstrap-responsive-d8fb58d917720af43f999baa39a07618.css
	new file:   public/assets/_bootstrap-responsive-d8fb58d917720af43f999baa39a07618.css.gz
	new file:   public/assets/application-246d3e722dd8a4e1801d93f84ab0666c.js
	new file:   public/assets/application-246d3e722dd8a4e1801d93f84ab0666c.js.gz
	new file:   public/assets/application-28c2c0cdc2e9c7bb5d1154f082a45d2a.js
	new file:   public/assets/application-28c2c0cdc2e9c7bb5d1154f082a45d2a.js.gz
	new file:   public/assets/application-4e1c83aee4efc6dfda6f86e06a0bab7e.css
	new file:   public/assets/application-4e1c83aee4efc6dfda6f86e06a0bab7e.css.gz
	new file:   public/assets/application-5be14c448fde88a68d4a1a9d7ef2604c.css
	new file:   public/assets/application-5be14c448fde88a68d4a1a9d7ef2604c.css.gz
	new file:   public/assets/application-6f06226a4e61730aaac9244b900cef13.css
	new file:   public/assets/application-6f06226a4e61730aaac9244b900cef13.css.gz
	new file:   public/assets/application-98c26ade3f0181825519e22b44d9eab4.js
	new file:   public/assets/application-98c26ade3f0181825519e22b44d9eab4.js.gz
	new file:   public/assets/application-c196f612c4afa5496757b0f785cd1d1e.css
	new file:   public/assets/application-c196f612c4afa5496757b0f785cd1d1e.css.gz
	new file:   public/assets/application.css
	new file:   public/assets/application.css.gz
	new file:   public/assets/application.js
	new file:   public/assets/application.js.gz
	new file:   public/assets/bootstrap-852dd4d09d3eb97a8d83bf99631314c5.css
	new file:   public/assets/bootstrap-852dd4d09d3eb97a8d83bf99631314c5.css.gz
	new file:   public/assets/bootstrap-affix-0d5025d0af99fbc5eda8d69632450f43.js
	new file:   public/assets/bootstrap-affix-0d5025d0af99fbc5eda8d69632450f43.js.gz
	new file:   public/assets/bootstrap-affix-eea2dd5f5ffd576bd0d1b273e40e2232.js
	new file:   public/assets/bootstrap-affix-eea2dd5f5ffd576bd0d1b273e40e2232.js.gz
	new file:   public/assets/bootstrap-alert-9f27a57cce7e0aeabd834094f4110ff3.js
	new file:   public/assets/bootstrap-alert-9f27a57cce7e0aeabd834094f4110ff3.js.gz
	new file:   public/assets/bootstrap-alert-f722d1ccd6c572856f8256700774c7e5.js
	new file:   public/assets/bootstrap-alert-f722d1ccd6c572856f8256700774c7e5.js.gz
	new file:   public/assets/bootstrap-button-6f4f41c2243470b1912cf4558ea268ac.js
	new file:   public/assets/bootstrap-button-6f4f41c2243470b1912cf4558ea268ac.js.gz
	new file:   public/assets/bootstrap-button-d8804ced2daa67bfaa97818c3d59c0d3.js
	new file:   public/assets/bootstrap-button-d8804ced2daa67bfaa97818c3d59c0d3.js.gz
	new file:   public/assets/bootstrap-c8fbb61b3c3038078665eda7f6b35e2d.js
	new file:   public/assets/bootstrap-c8fbb61b3c3038078665eda7f6b35e2d.js.gz
	new file:   public/assets/bootstrap-carousel-4f9a7b80a7fb996285ef2fb3fb1d4025.js
	new file:   public/assets/bootstrap-carousel-4f9a7b80a7fb996285ef2fb3fb1d4025.js.gz
	new file:   public/assets/bootstrap-carousel-b998449a56175f2710a551c7bd740b89.js
	new file:   public/assets/bootstrap-carousel-b998449a56175f2710a551c7bd740b89.js.gz
	new file:   public/assets/bootstrap-collapse-547ef814d59b75b829d3ecc29ece2d8d.js
	new file:   public/assets/bootstrap-collapse-547ef814d59b75b829d3ecc29ece2d8d.js.gz
	new file:   public/assets/bootstrap-collapse-c8ef23c5ea092225b650bfaad24ebbb7.js
	new file:   public/assets/bootstrap-collapse-c8ef23c5ea092225b650bfaad24ebbb7.js.gz
	new file:   public/assets/bootstrap-dropdown-7226ffe514a8b9172be5c8c882b817ab.js