Resolving conflicts in
Merge branch 'master' of https://github.com/icaruus/il12a
Merge branch 'master' of https://github.com/icaruus/il12a
Adjusted names of model classes in interface.