Merge branch 'release/7.x-0.3' into develop
Lineendings converted to LF
update formatting
updated to version 7.x-0.4
Merge branch 'release/7.x-0.4'