updated change.log
Merge branch 'dev-v2' into dev-v3

Conflicts:
	CHANGE.log
removed v4.0 from change.log