Update CHANGELOG.
Merge branch '1.4-master' of github.com:grke/burp into 1.4-master

Conflicts:
	CHANGELOG