changelog and version
Merge branch 'develop'