Merge pull request #1 from travisbloom/NewSchema

New schema
no message
Revert "no message"

This reverts commit c7d818d05bbb515113347632e3615b13306050d4.
mockMongo updated with locations
Merge pull request #2 from travisbloom/ChrisBranch

Chris branch
mongo fixes, initial angular animations
Merge branch 'master' of https://github.com/travisbloom/expresssampleapp
split tool admin view in to main and modal
Merge pull request #3 from travisbloom/NewSchema

Inventory Capability
Swati's latest commit
Fixed merged conflicts with Nick's changes
Adding Master Tool views and controllers
Tested adding/removing inventory mgmt