dojo part II
Merge branch 'master' of https://github.com/ricardobaumann/inventory_on_rails