dryer out Backbone data action triggers
dryed out Backbone data action triggers
Merge branch 'jr_setting_up_entries_index' of github.com:johntrandall/contracto into jr_setting_up_entries_index
setting up entries - view. not quite working yet
entries collection working
Merge branch 'aw_styling_outer_framework' into dev

Conflicts:
	app/assets/javascripts/backbone/backbone_application_loader.js
	app/assets/javascripts/backbone/views/job_view.js
	app/views/companies/show.html.erb
	app/views/jobs/_index.html.erb
	vendor/assets/stylesheets/reset.css

Fixed merges - but broke some styling. highlight doesn't work.
cleanup of extraneous code
Fixed styling front-end framework issues.  Added sidebar.css and sidebar.js -- not yet implemented.
Merge branch 'dev' into aw_styling_outer_framework

* dev:
  Fixed styling front-end framework issues.  Added sidebar.css and sidebar.js -- not yet implemented.
  cleanup of extraneous code
  entries collection working
  setting up entries - view. not quite working yet
  dryed out Backbone data action triggers
  dryer out Backbone data action triggers

Conflicts:
	app/views/layouts/_sidebar_right.html.erb