Merge branch 'master' of /home/torkel/dev/go/src/github.com/torkelo/backend

Conflicts:
	.gitignore
	LICENSE.md
	README.md

README.md

@@ -10,6 +10,54 @@ Graphite, InfluxDB & OpenTSDB.
 
 ![](http://grafana.org/assets/img/start_page_bg.png)
 
+# Grafana 2.0 Branch
+
+[![wercker status](https://app.wercker.com/status/0f109051cfaf2a6d94c0eebdc0dcaeae/s "wercker status")](https://app.wercker.com/project/bykey/0f109051cfaf2a6d94c0eebdc0dcaeae)
+
+## building and running
+Before trying to build make sure the grafana frontend git submodule is loaded.
+
+By clone recursive
+
+```
+git clone --recursive <this_repo>
+```
+
+In case of after clone
+```
+git submodule update --init
+```
+
+Building
+```
+go run build.go setup (only needed once to install godep)
+go run build.go build
+```
+
+For quicker builds:
+
+```
+godep restore (will pull down all golang lib dependecies in your current GOPATH)
+go build -o ./bin/grafana .
+```
+
+To build less to css for frontend:
+
+```
+cd grafana
+npm install
+npm install -g grunt-cli
+grunt
+```
+
+To rebuild on source change:
+```
+go get github.com/Unknwon/bra
+
+bra run
+```
+
+
 ## Features
 ### Graphite Target Editor
 - Graphite target expression parser
@@ -83,4 +131,7 @@ Before creating a pull request be sure that "grunt test" runs without any style
 please [sign the CLA](http://grafana.org/docs/contributing/cla.html)
 
 ## License
+
 Grafana is distributed under Apache 2.0 License.
+Work in progress Grafana 2.0 (with included Grafana backend)
+