feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457

docs(ldap): Clarify LDAP features and sample config

* Clarify certain features, such as multiple mappings
* Fixup ldap.toml sample config
* Fixup docs README's port number
* Fixup bad link from LDAP docs to Configuration docs
* Fixup some spelling, grammar, and line endings

fix(influxdb 0.9): removed  function from function dropdown as this function does not exist in InfluxDB 0.9

feat(timepicker): added new relative time option , will set time range to midnight to now, closes #1186

Conflicts:
	public/css/less/gfbox.less
	public/emails/reset_password.html
	public/emails/welcome_on_signup.html

feat(invite): lots of work completing the new email template system and css inlineing, converted new_user_invite.html to new system, #2353

Merge branch 'influxdb_alias_columns' of https://github.com/thuck/grafana into thuck-influxdb_alias_columns

fix(graphite): Fix for bug when using series ref (#A-Z) and referenced series is hidden in query editor. fixes #2484

With this patch it's possible to use the column name as an identifier.
This can help when we have multiple columns as it would be possible to automatic generate a legend.
Also this would help in future when grafana could support the "AS" in the query builder.

Including more special options for fill

Included "previous" and "none" as possible values for fill.
From the influxdb documentation:
 - "previous" means the values of the previous window is used.
 - "none" means that all null values are removed.

Change log file permissions from 0660 to 0644

Depending of the value a different set of operators will show up.
If regex only =~ and !~ will show up.
Any other value will show =, <>, <, >.

This should fix the case from when we migrate from a version that doesn't contain tag.operator.