Merge branch 'release/v1.4'
Merge branch 'release/v1.5'
need hotfix, put Entrainment mapping in prematurely
removed Entrainment Mapping from reference list
Merge branch 'hotfix/v1.5.1' into develop
added 1.5.1.txt changelog