Update changelog
Merge branch 'update_changelog_' into 'master'

Update changelog

See merge request !1258
Merge branch 'master' of github.com:gitlabhq/gitlabhq

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG