Installed devise. Added callback for admin to auto-create company.
added basic controllers and view placeholders for login, job, and entry
updated tests
removed "test" folder (we are using rspec instead)
vendor asset javascript and css files added as well as companies view page with starter partials in progress
Merge branch 'dev' into aw_company_show

* dev:
  removed "test" folder (we are using rspec instead)
  updated tests
  added basic controllers and view placeholders for login, job, and entry
  Installed devise. Added callback for admin to auto-create company.

Conflicts:
	app/views/companies/show.html.erb

		resolved conflict by keeping most of the stuff from dev
Added additional JS files required for the job table view.
added seed. tweaked models to resolve latent errors
Merge branch 'dev' into aw_company_show

* dev:
  added seed. tweaked models to resolve latent errors
Merge branch 'aw_company_show' of github.com:johntrandall/contracto into _jr_setting_up_backbone

# By Andrew Wallace
# Via Andrew Wallace
* 'aw_company_show' of github.com:johntrandall/contracto:
  Added additional JS files required for the job table view.
  vendor asset javascript and css files added as well as companies view page with starter partials in progress
setups basic backbone for jobs
restoring functionality that was disabled while hunting for a bug.
Merge branch 'dev' into aw_company_show

* dev:
  restoring functionality that was disabled while hunting for a bug.
  setups basic backbone for jobs
jobs list render is coming along
Added forms for job list, jobs, entries, and sidebars.  Updated balsamiq mockups.
Merge branch 'aw_forms' of github.com:johntrandall/contracto into _jr_setting_up_backbone

# By Andrew Wallace
# Via Andrew Wallace
* 'aw_forms' of github.com:johntrandall/contracto:
  Added forms for job list, jobs, entries, and sidebars.  Updated balsamiq mockups.

Conflicts:
	app/assets/javascripts/backbone/backbone_application_loader.js
	app/controllers/jobs_controller.rb
	app/views/companies/show.html.erb
	app/views/jobs/_index.html.erb

conflicts resolved to serve up multiple partials
added notes
made backbone work for jobs index