Included inventory.txt
Changed format of Dialogs file
Fix merge issues