new file:   app/assets/images/Thumbs.db
	modified:   app/assets/javascripts/application.js
	new file:   app/assets/javascripts/contracts.js.coffee
	new file:   app/assets/javascripts/datepicker.js
	new file:   app/assets/javascripts/storages.js.coffee
	modified:   app/assets/stylesheets/application.css
	new file:   app/assets/stylesheets/contracts.css.scss
	new file:   app/assets/stylesheets/foundation_and_overrides.css.scss
	new file:   app/assets/stylesheets/foundation_and_overrides.scss~
	modified:   app/assets/stylesheets/my.css.scss
	new file:   app/assets/stylesheets/storage.css.scss
	new file:   app/assets/stylesheets/storages.css.scss
	modified:   app/controllers/application_controller.rb
	new file:   app/controllers/application_controller.rb~
	new file:   app/controllers/contracts_controller.rb
	modified:   app/controllers/finances_controller.rb
	modified:   app/controllers/paymentcashes_controller.rb
	modified:   app/controllers/posts_controller.rb
	modified:   app/controllers/staff_task_journals_controller.rb
	modified:   app/controllers/staffobjectjournals_controller.rb
	modified:   app/controllers/staffs_controller.rb
	new file:   app/controllers/staffs_controller.rb~
	new file:   app/controllers/storages_controller.rb
	new file:   app/controllers/task_delegates_controller.rb
	modified:   app/controllers/tasks_controller.rb
	modified:   app/controllers/uploads_controller.rb
	new file:   app/controllers/uploads_controller.rb~
	modified:   app/controllers/workobjects_controller.rb
	new file:   app/controllers/workobjects_controller.rb~
	new file:   app/helpers/.workobjects_helper.rb.swp
	modified:   app/helpers/application_helper.rb
	new file:   app/helpers/application_helper.rb~
	new file:   app/helpers/contracts_helper.rb
	modified:   app/helpers/finances_helper.rb
	modified:   app/helpers/posts_helper.rb
	new file:   app/helpers/send_sms_helper.rb
	modified:   app/helpers/staffobjectjournals_helper.rb
	new file:   app/helpers/staffs_helper.rb
	new file:   app/helpers/storages_helper.rb
	modified:   app/helpers/tasks_helper.rb
	modified:   app/helpers/workobjects_helper.rb
	modified:   app/mailers/mailer.rb
	new file:   app/models/ability.rb
	new file:   app/models/contract.rb
	new file:   app/models/contract_wo_jobhands.rb
	new file:   app/models/date_posts_uploads.rb
	new file:   app/models/finance_wo_staff.rb
	modified:   app/models/post.rb
	new file:   app/models/role.rb
	modified:   app/models/staff.rb
	new file:   app/models/staffs_role.rb
	new file:   app/models/storage.rb
	modified:   app/models/task.rb
	new file:   app/models/task_wo_staff.rb
	modified:   app/models/upload.rb
	modified:   app/models/workobject.rb
	new file:   app/models/workobject_contract.rb
	new file:   app/views/contracts/_c_wo_job_form.html.erb
	new file:   app/views/contracts/_form.html.erb
	new file:   app/views/contracts/add_wo.html.erb
	new file:   app/views/contracts/edit.html.erb
	new file:   app/views/contracts/edit_wo.html.erb
	new file:   app/views/contracts/index.html.erb
	new file:   app/views/contracts/new.html.erb
	new file:   app/views/contracts/new_wo.html.erb
	new file:   app/views/contracts/show.html.erb
	modified:   app/views/devise/mailer/reset_password_instructions.html.erb
	modified:   app/views/devise/passwords/edit.html.erb
	modified:   app/views/devise/passwords/new.html.erb
	modified:   app/views/devise/shared/_links.erb
	new file:   app/views/errors/accessdenied.html.erb
	new file:   app/views/finances/.index.html.erb.swp
	modified:   app/views/finances/_form.html.erb
	modified:   app/views/finances/index.html.erb
	modified:   app/views/layouts/application.html.erb
	new file:   app/views/mailer/task_end_notification.html.erb
	new file:   app/views/mailer/task_expire_notification.html.erb
	new file:   app/views/mailer/task_expireds_alert.html.erb
	modified:   app/views/map/index.html.erb
	modified:   app/views/posts/_form.html.erb
	modified:   app/views/posts/index.html.erb
	modified:   app/views/posts/new.html.erb
	modified:   app/views/staffobjectjournals/_form.html.erb
	modified:   app/views/staffobjectjournals/index.html.erb
	new file:   app/views/staffs/_finances.html.erb
	modified:   app/views/staffs/_form.html.erb
	new file:   app/views/staffs/_form.html.erb~
	new file:   app/views/staffs/edit_password.html.erb
	modified:   app/views/staffs/index.html.erb
	modified:   app/views/staffs/show.html.erb
	new file:   app/views/storages/_form.html.erb
	new file:   app/views/storages/_index_admin.html.erb
	new file:   app/views/storages/_index_user.html.erb
	new file:   app/views/storages/edit.html.erb
	new file:   app/views/storages/index.html.erb
	new file:   app/views/storages/new.html.erb
	new file:   app/views/storages/show.html.erb
	new file:   app/views/tasks/.edit.html.erb.swp
	modified:   app/views/tasks/_form.html.erb
	modified:   app/views/tasks/_history.html.erb
	modified:   app/views/tasks/_index_admin.html.erb
	new file:   app/views/tasks/_index_delegate.html.erb
	modified:   app/views/tasks/_index_user.erb
	modified:   app/views/tasks/_index_user.html.erb
	modified:   app/views/tasks/_posts.html.erb
	new file:   app/views/tasks/change.js.erb
	modified:   app/views/tasks/index.html.erb
	modified:   app/views/tasks/show.html.erb
	modified:   app/views/uploads/_form.html.erb
	modified:   app/views/uploads/index.html.erb
	new file:   app/views/workobjects/_finances.html.erb
	modified:   app/views/workobjects/_form.html.erb
	modified:   app/views/workobjects/_post.html.erb
	modified:   app/views/workobjects/index.html.erb
	modified:   app/views/workobjects/show.html.erb
	new file:   config/application.rb
	new file:   config/boot.rb
	new file:   config/environment.rb
	new file:   config/environments/development.rb
	new file:   config/environments/production.rb
	new file:   config/environments/test.rb
	new file:   config/initializers/backtrace_silencers.rb
	new file:   config/initializers/inflections.rb
	new file:   config/initializers/mime_types.rb
	new file:   config/initializers/secret_token.rb
	new file:   config/initializers/session_store.rb
	new file:   config/initializers/wrap_parameters.rb
	new file:   config/locales/devise.en.yml
	new file:   config/locales/en.yml
	modified:   config/routes.rb
	new file:   db/data.yml
	new file:   db/migrate/20140212102919_create_roles.rb
	new file:   db/migrate/20140212103008_create_staffs_roles.rb
	new file:   db/migrate/20140212142126_status_on_staffs.rb
	new file:   db/migrate/20140212142126_status_on_staffs.rb~
	new file:   db/migrate/20140212185031_add_roles_mask_to_staffs.rb
	new file:   db/migrate/20140220202025_add_workobjects_columns.rb
	new file:   db/migrate/20140222082342_create_storages.rb
	new file:   db/migrate/20140226180624_create_contracts.rb
	new file:   db/migrate/20140317193103_add_contract_to_uploads.rb
	new file:   db/migrate/20140317195134_create_contract_wo_jobhands.rb
	new file:   db/migrate/20140318152502_remove_field_from_table_contract.rb
	new file:   db/migrate/20140405071711_add_period_to_tasks.rb
	new file:   db/migrate/20140412144243_add_fields_to_posts.rb
	new file:   db/schema.rb
	new file:   db/seeds.rb
	modified:   lib/tasks/crontab.rake
	new file:   lib/templates/erb/scaffold/_form.html.erb
	modified:   public/images/down_arrow.gif
	new file:   public/images/pin.gif
	deleted:    sms_key_api