refactoring dialog+model+parser
further refactoring and fixed tests
Merge pull request #27 from maciejborkowski/dev

Refactoring