things dont work
Merge branch 'master' into az

Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
make rules assignable across tiers
Merge branch 'master' into az
Merge branch 'master' into az
Merge branch 'master' of github.com:metamx/druid into az
Merge branch 'master' into az
passing tests from loading across tiers
Merge branch 'master' into az
bridge is kinda working for mastery stuff right now, tests pass
queries working at this point, tests pass, still need more tests and fix rules interface
more tests
Merge branch 'master' into az
fix GUI
Merge branch 'master' into az

Conflicts:
	docs/content/Realtime.md
	server/src/main/java/io/druid/client/selector/ServerSelector.java
Merge branch 'master' into az

Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
	server/src/main/java/io/druid/server/http/CoordinatorResource.java
	server/src/test/java/io/druid/client/DirectDruidClientTest.java
Merge branch 'master' into az

Conflicts:
	server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java
Merge branch 'master' into az
port hll from 0.5.x to 0.6.x
move tests