saving befor checkout
Merge branch 'dev' of github.com:Herzucco/squalala into adrien/json_dialog_builder
dialog parsing done
Merge pull request #10 from Herzucco/adrien/json_dialog_builder

Adrien/json dialog builder