Differences only in blanks, git enforces me to commit due to strange conflicts.
Merge branch 'master' of https://github.com/Flexberry/FlexberryORM-DemoApp.git