Update CHANGES and AUTHORS due merge of repository klaaspeter/achievo