update change log
Merge branch 'development'