Update CHANGELOG.txt
Merge branch 'hotfix/next' of https://github.com/Espurna/Bika-LIMS into hotfix/next
Merge remote-tracking branch 'upstream/hotfix/next' into hotfix/next
Merge remote-tracking branch 'upstream/hotfix/next' into hotfix/next

Conflicts:
	CHANGELOG.txt
Merge pull request #1372 from Espurna/hotfix/next

easy... ;)