update changelog
Merge branch 'master' of github.com:codio/site
update changelog