dojo 1
Merge branch 'master' of https://github.com/ricardobaumann/inventory_on_rails into develop
dojo 1