added changelog
Merge pull request #331 from panique/develop

added changelog