fix readme file
resolve conflict
Merge branch 'master' of https://github.com/otsdev/ALFA-Generator
Merge branch 'master' of https://github.com/otsdev/ALFA-Generator
Merge branch 'master' of https://github.com/otsdev/ALFA-Generator
Merge branch 'master' of https://github.com/otsdev/ALFA-Generator
refactor the generated code