Merge branch 'master' into alerting

Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go

conf/defaults.ini

@@ -178,6 +178,9 @@ login_hint = email or username
 # Default UI theme ("dark" or "light")
 default_theme = dark
 
+# Allow users to sign in using username and password
+allow_user_pass_login = true
+
 #################################### Anonymous Auth ##########################
 [auth.anonymous]
 # enable anonymous access

conf/sample.ini

@@ -42,8 +42,9 @@
 # Prevents DNS rebinding attacks
 ;enforce_domain = false
 
-# The full public facing url
-;root_url = %(protocol)s://%(domain)s:%(http_port)s/
+# The full public facing url you use in browser, used for redirects and emails
+# If you use reverse proxy and sub path specify full url (with sub path)
+;root_url = http://localhost:3000
 
 # Log web requests
 ;router_logging = false