added inventory type model and controller
Added gem pry and quite assets.  Javascript for inventory type
fixed conflicts
fixed schema conflicts