merge changelist.txt into CHANGELOG
Update version in boot.php