Updated changelog
Added Gitter badge
Merge pull request #889 from gitter-badger/gitter-badge

Add a Gitter chat badge to README.md
Updated gitter badge
Updated gitter badge
Added grafana logo to repo instead of fetching it from grafana.org, Fixes #881
Small tweak to shared tooltip edit option in Display styles tab
Fix to new checkboxes in features toggles tab
Dashboard: fix for dashboard schema upgrade during load, ensure that annotation and templating object as a list array, Closes #890
Merge fix from 'v1.8.x' branch

Conflicts:
	CHANGELOG.md
fixed stupid unit test mistake
Merge branch 'v1.8.x'
Merge remote-tracking branch 'upstream/master'