Updated changelog
Graph: shared tooltip improvements, info tooltip when point counts are not the same, #850
Updated AngularJS from 1.3-beta-17 to 1.3-RC3
update to test helper
Dashboard: show error when importing dashboard json file with broken/incorrect json syntax, Closes #878
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'
Fixed issue casued by recent angular upgrade and stateful filter, casued template vars in graph titles no update properly, angular was not updated in 1.8.1 so this does affect any released version, Closes #892
Css fix for metrics tab, help boxes did extend page height so could not scroll if they extended below screen, #891