update changelog
Merge pull request #1251 from conejoninja/develop

update changelog