Removed obsolete code. Fixed phpStorm warnings
Merge branch 'development' into dev/j2/common
Fixed line separators and encodings
Fixed line separators and encodings
Fixed line endings