Fixed issue nr
Merge remote-tracking branch 'origin/develop'

Conflicts:
	CHANGES
Corrected path to changes
Release of new version 1.18.0
Fixed indent
Merge remote-tracking branch 'origin/master' into develop