Properties module can now take multiple properties files
unit tests passing with offheap-indexing
Merge branch 'master' into offheap-incremental-index
close IncrementalIndex properly and free up buffer
refactor examples to use global runtime
Merge branch 'master' into new-init

Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
add header
configure buffer sizes
Merge branch 'master' into offheap-incremental-index

Conflicts:
	processing/src/main/java/io/druid/query/GroupByParallelQueryRunner.java

processing/src/main/java/io/druid/query/groupby/GroupByQueryRunnerFactor
y.java

processing/src/main/java/io/druid/segment/incremental/IncrementalIndexSt
orageAdapter.java
fix race while index closing and querying
Merge branch 'master' into offheap-incremental-index
fix compilation
remove unnecessary changes & fix index closing subquery
Merge branch 'master' into offheap-incremental-index

Conflicts:
	processing/src/main/java/io/druid/query/groupby/GroupByQueryHelper.java

processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChe
st.java

processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.j
ava
add retry feature on broker side; modify QueryRunner inferface and tests
revert changes in pom file
change the way to use RetryQueryRunnerConfig
change the signature of run()
fix concurrency issue with the map; introduce new exception; add incomplete retry query runner test
fix header so it passes the entire context