Updated changelog and bumped version number
Merge branch 'master' of github.com:zedapp/zed