Renamed Camera to Model and Manufacturer to Vendor
Revert "Recorder fixes" (Resolved all conflicts manually)

This reverts commit afef9bb82597a276a90575cfcdea2b49226bbadb.

Conflicts:
	.env
	app/assets/javascripts/application.coffee
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/base.css.scss.erb
	app/assets/stylesheets/camera_index.css.scss
	app/assets/stylesheets/camera_show.css.scss.erb
	app/assets/stylesheets/header.css.scss
	app/assets/stylesheets/model_index.css.scss
	app/controllers/api/v1/models_controller.rb
	app/controllers/api/v1/recorders_controller.rb
	app/controllers/models_controller.rb
	app/controllers/recorders_controller.rb
	app/helpers/application_helper.rb
	app/helpers/pages_helper.rb
	app/helpers/recorders_helper.rb
	app/models/recorder.rb
	app/models/vendor.rb
	app/views/api/v1/recorders/_recorder.json.jbuilder
	app/views/api/v1/recorders/index.json.jbuilder
	app/views/api/v1/recorders/show.json.jbuilder
	app/views/layouts/application.html.erb
	app/views/models/show.html.erb
	app/views/pages/index.html.erb
	app/views/recorders/_form.html.erb
	app/views/recorders/edit.html.erb
	app/views/recorders/index.html.erb
	app/views/recorders/new.html.erb
	app/views/recorders/search.html.erb
	app/views/recorders/show.html.erb
	app/views/shared/_add_recorder_modal.erb
	app/views/shared/_filters.html.erb
	app/views/shared/_header.html.erb
	app/views/shared/_models.html.erb
	app/views/shared/_recorders.html.erb
	app/views/shared/_sidebar.html.erb
	app/views/vendors/index.html.erb
	config/routes.rb
	db/migrate/20140924124928_create_recorder.rb
	lib/assets/javascripts/swagger/lib/backbone-min.js
	lib/assets/javascripts/swagger/lib/handlebars-1.0.0.js
	lib/assets/javascripts/swagger/lib/highlight.7.3.pack.js
	lib/assets/javascripts/swagger/lib/jquery.ba-bbq.min.js
	lib/assets/javascripts/swagger/lib/jquery.slideto.min.js
	lib/assets/javascripts/swagger/lib/jquery.wiggle.min.js
	lib/assets/javascripts/swagger/lib/shred.bundle.js
	lib/assets/javascripts/swagger/lib/shred/content.js
	lib/assets/javascripts/swagger/lib/swagger-oauth.js
	lib/assets/javascripts/swagger/lib/swagger-ui.js
	lib/assets/javascripts/swagger/lib/swagger.js
	lib/assets/javascripts/swagger/lib/underscore-min.js
	lib/assets/javascripts/swagger/swagger-ui.js
	lib/tasks/alter_data.rake
Fixes to sync with heroku/add_recorders
Added recorders to side bar and placed Vendors link before Model
Fixed swagger files
Fixed error coming up when Next/Prev clicked on Recorders
Fixed issue with browsing Models (only ACTi models were shown)
Revert commit 5b4d102b8b296ecebff0dfa7c52324afbde960f8 (Fixed error coming up when Next/Prev clicked on Recorders) (resolved commit manually)

Conflicts:
	app/controllers/models_controller.rb
	app/views/models/show.html.erb
	app/views/recorders/show.html.erb
Merge pull request #31 from evercam/model_vendor_recorder

Model Vendor Recorder