Merge branch 'master' of github.com:grafana/grafana

: Please enter a commit message to explain why this merge is necessary,

ROADMAP.md

-# Roadmap (2017-04-23)
+# Roadmap (2017-08-29)
 
 
 This roadmap is a tentative plan for the core development team. Things change constantly as PRs come in and priorities change. 
 This roadmap is a tentative plan for the core development team. Things change constantly as PRs come in and priorities change. 
 But it will give you an idea of our current vision and plan. 
 But it will give you an idea of our current vision and plan. 
 
 
 ### Short term (1-4 months)
 ### Short term (1-4 months)
 
 
- - New Heatmap Panel (Implemented and available in master)
- - Support for MySQL & Postgres as data sources (Work started and a alpha version for MySQL is available in master)
- - User Groups & Dashboard folders with ACLs (work started, not yet completed, https://github.com/grafana/grafana/issues/1611#issuecomment-287742633)
- - Improve new user UX
- - Improve docs
- - Support for alerting for Elasticsearch (can be tested in [branch](https://github.com/grafana/grafana/tree/alerting-elasticsearch) but needs more work)
-  - Graph annotations (create from grafana, region annotations, better annotation viz)
-  - Improve alerting (clustering, silence rules)
+ - Release Grafana v4.5 with fixes and minor enhancements 
+ - Release Grafana v5
+  - User groups
+  - Dashboard folders
+  - Dashboard permissions (on folders as well), permissions on groups or users
+  - New Dashboard layout engine
+  - New sidemenu & nav UX
+  - Elasticsearch alerting
   
   
 ### Long term 
 ### Long term 
 
 
-- Improved dashboard panel layout engine (to make it easier and enable more flexible layouts) 
 - Backend plugins to support more Auth options, Alerting data sources & notifications
 - Backend plugins to support more Auth options, Alerting data sources & notifications
 - Universial time series transformations for any data source (meta queries)
 - Universial time series transformations for any data source (meta queries)
 - Reporting
 - Reporting
 - Web socket & live data streams
 - Web socket & live data streams
-- Migrate to Angular2 
+- Migrate to Angular2 or react
 
 
 
 
 ### Outside contributions
 ### Outside contributions
 We know this is being worked on right now by contributors (and we hope to merge it when it's ready). 
 We know this is being worked on right now by contributors (and we hope to merge it when it's ready). 
 
 
-- Dashboard revisions (be able to revert dashboard changes)
 - Clustering for alert engine (load distribution)  
 - Clustering for alert engine (load distribution)