update guava, java-util, and druid-api
Merge branch 'master' of github.com:metamx/druid into new-guava
Merge branch 'master' into new-guava

Conflicts:
	server/src/main/java/io/druid/server/QueryResource.java
address code review
Merge branch 'master' of github.com:metamx/druid into new-guava
fix bad merge
Merge branch 'master' into new-guava
Merge pull request #578 from metamx/new-guava

Update guava, java-util, and druid-api