diff --git a/conf/sample.ini b/conf/sample.ini
index fa39b220fa6..4e4c335ae18 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -33,11 +33,38 @@ ssl_mode = disable
; For "sqlite3" only
path = /opt/grafana/data/grafana.db
+[security]
+; default admin user, created on startup
+admin_user = admin
+; default admin password, can be changed before first start of grafana, or in profile settings
+admin_password = admin
+; used for signing
+secret_key = SW2YcwTIb9zpOOhoPsMm
+; Auto-login remember days
+login_remember_days = 7
+cookie_username = grafana_user
+cookie_remember_name = grafana_remember
+
+[users]
+; disable user signup / registration
+allow_sign_up = true
+; Allow non admin users to create organizations
+allow_org_create = true
+# Set to true to automatically assign new users to the default organization (id 1)
+auto_assign_org = true
+; Default role new users will be automatically assigned (if disabled above is set to true)
+auto_assign_org_role = Viewer
+
+[auth.anonymous]
+; enable anonymous access
+enabled = false
+; specify organization name that should be used for unauthenticated users
+org_name = Main org.
+; specify role for unauthenticated users
+org_role = Viewer
+
[log]
level = Trace
mode = console, file
root_path = /var/log/grafana
-
-
-
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 9db0225a948..562b56b8055 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -31,8 +31,10 @@ pages:
- ['installation/provisioning.md', 'Installation', 'Provisioning']
- ['installation/performance.md', 'Installation', 'Performance tips']
- ['installation/troubleshooting.md', 'Installation', 'Troubleshooting']
+- ['installation/migrating_to2.md', 'Installation', 'Migrating from v1.x to v2.x']
- ['guides/gettingstarted.md', 'User Guides', 'Getting started']
+- ['guides/changes_in_v2.md', 'User Guides', 'Changes and New Features in v2.0']
- ['guides/screencasts.md', 'User Guides', 'Screencasts']
- ['reference/graph.md', 'Reference', 'Graph options']
diff --git a/docs/sources/guides/changes_in_v2.md b/docs/sources/guides/changes_in_v2.md
new file mode 100644
index 00000000000..a567ac8fdb3
--- /dev/null
+++ b/docs/sources/guides/changes_in_v2.md
@@ -0,0 +1,120 @@
+---
+page_title: Changes and new features in Grafana v2.0
+page_description: Changes and new features in Grafana v2.0
+page_keywords: grafana, changes, features, documentation
+---
+
+# Changes and new features in v2.0
+
+This is a guide that descriptes some of changes and new features that can be found in Grafana v2.0.
+
+
+## New dashboard top header
+
+
+
+1. Side menu toggle
+2. Dashboard search (also includes access to New dashboard, Import & Playlist)
+3. Dashboard title
+4. Star/unstar current dashboard
+5. Share current dashboard (Make sure the dashboard is saved before)
+6. Save current dashboard
+7. Settings dropdown
+ - Dashboard settings
+ - Annotations
+ - Templating
+ - Export (exports current dashboard to json file)
+ - View JSON (view current dashboard json model)
+ - Save As... (Copy & Save current dashboard under a new name)
+ - Delete dashboard
+
+> **Note** In Grafana v2.0 when you change the title of a dashboard and then save it it will no
+> longer create a new dashboard. It will just change the name for the current dashboard.
+> To change name and create a new dashboard use the `Save As...` menu option
+
+## Panel time overrides & timeshift
+
+In Grafana v2.x you can now override the relative time range for individual panels. You can also add a
+time shift to individual panels. This allows you to show metrics from different time periods or days
+at the same time.
+
+
+
+You control these overrides in panel editor mode and the new tab `Time Range`.
+
+
+
+Currently you can only override the dashboard time with relative time ranges, not absolute time ranges. When
+you zoom or change the dashboard time to a custom absolute time range the panel overrides will be disabled. The
+panel relative time override is only active when the dashboard time is also relative. The panel timeshift override
+however is always active, even when the dashboard time is absolute.
+
+The `Hide time override info` option allows you to hide the the override info text that is by default shown in the
+upper right of a panel when overriden time range options.
+
+## New search view & starring dashboards
+
+
+
+The dashboard search view has received a big UI update and polish. You can now see and filter by which dashboard
+you have personally starred.
+
+## Dashlist panel
+
+
+
+There is one new panel in Grafana v2.0 and that is the `dashlist` panel that allows you to show your personal
+starred dashboards as well as do custom searches based on search strings or tags.
+
+## Data Source proxy & admin views
+
+Data sources in Grafana v2.0 are NOT defined in a config file but added through the UI. The backend can also
+handle proxying data source metric requests which meens that it is a lot easier to get started using Grafana with
+Graphite or OpenTSDB without having to spend time with nginx CORS (Cross origin resource sharing) work arounds.
+
+> **Note** For InfluxDB users: The data source proxy feature will
+> hide database user & password details from the frontend / browser.
+
+## Relative time now delay
+
+A problem that has plagued many is the fact that graphs tend to dip to zero by the end because metrics for
+the last interval has yet to be received by the time series database. You can now work around this by adding
+a now delay in `Dashboard Settings` > `Time Picker` tab.
+
+
+
+## Overwrite protection
+
+Grafana v2.0 will protect you and your other Grafana users from accidentally overwriting each others changes
+to the same dashboard. The same protection also applies if you try to create a new dashboard with a
+name that already exists.
+
+
+
+## User preferences
+
+If you open side menu (by clicking on the Grafana icon in the top header) you can access your profile page.
+Here you can update your user details, UI Theme and change password.
+
+## PNG rendering
+
+In the panel share dialog you now have access to a link that will render the panel to a PNG image.
+The panel is rendered on the backend via phantomjs (headless browser). This requires that you metric
+data source is accessable from your Grafana server host machine.
+
+
+
+## User & Organization permissions
+
+All dashboards and data sources are linked to an organization (not to a user). Users are linked to
+Organizations via a role. That role can be:
+
+- `Viewer`: Can only view dashboards, not save / create them.
+- `Editor`: Can view, update and create dashboards.
+- `Admin`: Everything an Editor can plus edit and add data sources and organization users.
+
+> **Note** A `Viewer` can still view all metrics exposed through a data source, not only
+> the metrics used in already existing dashboards. That is because there are not
+> per series permissions in Graphite, InfluxDB or OpenTSDB.
+
+There are currently no permissions on individual dashboards.
diff --git a/docs/sources/installation/migrating_to2.md b/docs/sources/installation/migrating_to2.md
new file mode 100644
index 00000000000..32b72be362b
--- /dev/null
+++ b/docs/sources/installation/migrating_to2.md
@@ -0,0 +1,42 @@
+---
+page_title: Migrating from v1.x to 2.x
+page_description: Migration guide for Grafana v1.x to v2.x
+page_keywords: grafana, installation, migration, documentation
+---
+
+# Migrating from v1.x to v2.x
+
+Grafana 2.x is pretty different from v1.x in that Grafana 2.x has its own backend and its own
+database to store dashboards and users in.
+
+## Import dashboards
+
+### From Elasticsearch
+Start by going to the `Data Sources` view and add your elasticsearch datasource. Specify the elasticsearch
+index name where your Grafana v1.x dashboards are stored, default is `grafana-dash`.
+
+
+
+
+### From InfluxDB
+
+Start by going to the `Data Sources` view and add your influxdb datasource. Specify the database
+name where your Grafana v1.x dashboards are stored, default is `grafana`.
+
+
+### Go to Import dashboards view
+
+Go to the `Dashboards` view and click on the dashboards search dropdown. At the bottom of the search dropdown
+you find the `Import` button.
+
+
+
+
+### Import view
+
+In the Import view you find the section `Migrate dashboards`. Pick the datasource you added (Elasticsearch or InfluxDB)
+and click the `Import` button.
+
+
+
+
diff --git a/src/app/features/org/partials/datasourceEdit.html b/src/app/features/org/partials/datasourceEdit.html
index c0fdf19bb77..db711831783 100644
--- a/src/app/features/org/partials/datasourceEdit.html
+++ b/src/app/features/org/partials/datasourceEdit.html
@@ -42,6 +42,7 @@
+
Http settings
-