mock up v1
updated add device drop down
adding new test for starting comment
initial commit
Merge pull request #5 from BoiseFED/header

Adding logo and css for header and form
Merge commit '86f06cc533365b719c7da6d5103a9b55e296c76b' into design
Updated with layer comps
Sort and error handling banners
This adds model methods and tests

- grunt: path check for saas and convert
- grunt: npm and bower check for dependencies
- backbone: added methods to the location, os and device models
- backbone: made location and os models initially instanciated
- test: testing device collection and model methods
- test: adding chai and sinon
- test: changing chai from should to expect
- package.json: changing npm test methods to use relative paths
- server.js: adding fields for checkout and checkin
Merge branch 'updating-device-models' of github.com:BoiseFED/device-registry into updating-device-models

Conflicts:
	public/js/device-model.js
	test/browser/backbone.js
Merge pull request #6 from BoiseFED/updating-device-models

Updating device models
Device grid start
Updated typo
Merge pull request #8 from BoiseFED/design

Design
Merge branch 'master' into add-device-form

Conflicts:
	public/scss/main.scss