Merge pull request #18 from jttorate/master

-- incoming module and other library updates
-- inventory deashboard admin update