modified:   .gitignore
	modified:   db/schema.rb
recrutamento versao 1
	new file:   app/assets/javascripts/job_offers.js.coffee
	new file:   app/assets/stylesheets/job_offers.css.scss
	new file:   app/controllers/job_offers_controller.rb
	new file:   app/helpers/job_offers_helper.rb
	modified:   app/models/company.rb
	new file:   app/models/job_offer.rb
	modified:   app/views/companies/show.html.erb
	new file:   app/views/job_offers/edit.html.erb
	new file:   app/views/job_offers/index.html.erb
	new file:   app/views/job_offers/new.html.erb
	new file:   app/views/job_offers/show.html.erb
	modified:   config/routes.rb
	new file:   db/migrate/20121121141730_create_job_offers.rb
	modified:   db/schema.rb
	new file:   test/fixtures/job_offers.yml
	new file:   test/functional/job_offers_controller_test.rb
	new file:   test/unit/helpers/job_offers_helper_test.rb
	new file:   test/unit/job_offer_test.rb
Merge branch 'master' of https://github.com/RasoTeam/platform into recrutamento

Conflicts:
	config/routes.rb
	renamed:    app/controllers/job_offers_controller.rb -> app/controllers/rasocomp/job_offers_controller.rb
	renamed:    app/views/job_offers/edit.html.erb -> app/views/rasocomp/job_offers/edit.html.erb
	renamed:    app/views/job_offers/index.html.erb -> app/views/rasocomp/job_offers/index.html.erb
	renamed:    app/views/job_offers/new.html.erb -> app/views/rasocomp/job_offers/new.html.erb
	renamed:    app/views/job_offers/show.html.erb -> app/views/rasocomp/job_offers/show.html.erb
Fixed bills partial render
Added TimeOff
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	app/models/user.rb
	config/routes.rb
user verifications temporarily removed from controllers
	modified:   app/controllers/backoffice/super_users_controller.rb
	modified:   app/controllers/rasocomp/bills_controller.rb
	modified:   app/controllers/rasocomp/companies_controller.rb
	modified:   app/controllers/rasocomp/users_controller.rb
Added layout
New project structure
	renamed:    app/assets/javascripts/super_user_sessions.js.coffee -> app/assets/javascripts/backoffice/super_user_sessions.js.coffee
	renamed:    app/assets/javascripts/super_users.js.coffee -> app/assets/javascripts/backoffice/super_users.js.coffee
	deleted:    app/assets/javascripts/dashboard.js.coffee
	deleted:    app/assets/javascripts/frontoffice/application.js.coffee
	deleted:    app/assets/javascripts/frontoffice/frontoffice.js.coffee
	renamed:    app/assets/javascripts/bills.js.coffee -> app/assets/javascripts/rasocomp/bills.js.coffee
	renamed:    app/assets/javascripts/companies.js.coffee -> app/assets/javascripts/rasocomp/companies.js.coffee
	renamed:    app/assets/javascripts/time_offs.js.coffee -> app/assets/javascripts/rasocomp/time_offs.js.coffee
	renamed:    app/assets/javascripts/user_sessions.js.coffee -> app/assets/javascripts/rasocomp/user_sessions.js.coffee
	renamed:    app/assets/javascripts/users.js.coffee -> app/assets/javascripts/rasocomp/users.js.coffee
	deleted:    app/assets/javascripts/staticpages.js.coffee
	renamed:    app/assets/stylesheets/super_user_sessions.css.scss -> app/assets/stylesheets/backoffice/super_user_sessions.css.scss
	renamed:    app/assets/stylesheets/super_users.css.scss -> app/assets/stylesheets/backoffice/super_users.css.scss
	deleted:    app/assets/stylesheets/dashboard.css.scss
	renamed:    app/assets/stylesheets/frontoffice/aboutus.css.scss -> app/assets/stylesheets/public/aboutus.css.scss
	renamed:    app/assets/stylesheets/frontoffice/application.css.scss -> app/assets/stylesheets/public/application.css.scss
	renamed:    app/assets/stylesheets/frontoffice/frontoffice.css.scss -> app/assets/stylesheets/public/frontoffice.css.scss
	renamed:    app/assets/stylesheets/bills.css.scss -> app/assets/stylesheets/rasocomp/bills.css.scss
	renamed:    app/assets/stylesheets/companies.css.scss -> app/assets/stylesheets/rasocomp/companies.css.scss
	renamed:    app/assets/stylesheets/time_offs.css.scss -> app/assets/stylesheets/rasocomp/time_offs.css.scss
	renamed:    app/assets/stylesheets/user_sessions.css.scss -> app/assets/stylesheets/rasocomp/user_sessions.css.scss
	renamed:    app/assets/stylesheets/users.css.scss -> app/assets/stylesheets/rasocomp/users.css.scss
	renamed:    app/helpers/super_user_sessions_helper.rb -> app/helpers/backoffice/super_user_sessions_helper.rb
	renamed:    app/helpers/super_users_helper.rb -> app/helpers/backoffice/super_users_helper.rb
	deleted:    app/helpers/dashboard_helper.rb
	deleted:    app/helpers/frontoffice/application_helper.rb
	deleted:    app/helpers/frontoffice/frontoffice_helper.rb
	renamed:    app/helpers/bills_helper.rb -> app/helpers/rasocomp/bills_helper.rb
	renamed:    app/helpers/companies_helper.rb -> app/helpers/rasocomp/companies_helper.rb
	renamed:    app/helpers/time_offs_helper.rb -> app/helpers/rasocomp/time_offs_helper.rb
	renamed:    app/helpers/user_sessions_helper.rb -> app/helpers/rasocomp/user_sessions_helper.rb
	renamed:    app/helpers/users_helper.rb -> app/helpers/rasocomp/users_helper.rb
	deleted:    app/helpers/staticpages_helper.rb
	deleted:    test/functional/dashboard_controller_test.rb
	deleted:    test/functional/staticpages_controller_test.rb
	deleted:    test/unit/helpers/dashboard_helper_test.rb
	deleted:    test/unit/helpers/staticpages_helper_test.rb
	deleted:    staticpages_controller.rb.old
	renamed:    backoffice/super_user_sessions.js.coffee -> public/super_user_sessions.js.coffee
	renamed:    rasocomp/user_sessions.js.coffee -> public/user_sessions.js.coffee
	renamed:    ../stylesheets/backoffice/super_user_sessions.css.scss -> ../stylesheets/public/super_user_sessions.css.scss
	renamed:    ../stylesheets/rasocomp/user_sessions.css.scss -> ../stylesheets/public/user_sessions.css.scss
	renamed:    ../../helpers/backoffice/super_user_sessions_helper.rb -> ../../helpers/public/super_user_sessions_helper.rb
	renamed:    ../../helpers/rasocomp/user_sessions_helper.rb -> ../../helpers/public/user_sessions_helper.rb
Structure updates, links
Merge branch 'master' of github.com:RasoTeam/platform
introducao de candidatos a job offers
	new file:   app/assets/javascripts/rasocomp/candidates.js.coffee
	new file:   app/assets/stylesheets/rasocomp/candidates.css.scss
	new file:   app/controllers/rasocomp/candidates_controller.rb
	modified:   app/controllers/rasocomp/job_offers_controller.rb
	new file:   app/helpers/rasocomp/candidates_helper.rb
	new file:   app/models/candidate.rb
	modified:   app/models/job_offer.rb
	new file:   app/views/rasocomp/candidates/apply.html.erb
	new file:   app/views/rasocomp/candidates/index.html.erb
	new file:   app/views/rasocomp/job_offers/appliances.html.erb
	new file:   app/views/rasocomp/job_offers/createapply.html.erb
	modified:   app/views/rasocomp/job_offers/edit.html.erb
	new file:   app/views/rasocomp/job_offers/formapply.html.erb
	modified:   app/views/rasocomp/job_offers/index.html.erb
	new file:   app/views/rasocomp/job_offers/manage_offer.html.erb
	modified:   app/views/rasocomp/job_offers/show.html.erb
	new file:   app/views/rasocomp/job_offers/showapply.html.erb
	modified:   config/routes.rb
	new file:   db/migrate/20121122010008_create_candidates.rb
	modified:   db/schema.rb
	new file:   test/fixtures/candidates.yml
	new file:   test/functional/rasocomp/candidates_controller_test.rb
	new file:   test/unit/candidate_test.rb
	new file:   test/unit/helpers/rasocomp/candidates_helper_test.rb
Merge branch 'master' of https://github.com/RasoTeam/platform into recrutamento

Conflicts:
	config/routes.rb
	db/schema.rb
	modified:   app/controllers/application_controller.rb
	modified:   app/helpers/backoffice/super_users_helper.rb
	modified:   app/helpers/public/super_user_sessions_helper.rb
	modified:   app/helpers/public/user_sessions_helper.rb
	modified:   app/helpers/rasocomp/bills_helper.rb
	modified:   app/helpers/rasocomp/companies_helper.rb
	modified:   app/helpers/rasocomp/time_offs_helper.rb
	modified:   app/helpers/rasocomp/users_helper.rb
Merge branch 'master' of github.com:RasoTeam/platform
Merge branch 'master' of https://github.com/RasoTeam/platform into recrutamento