Fixed line separators and encodings
Fixed line endings
Merge branch 'dev/j2/common' into dev/j2/free