Properties module can now take multiple properties files
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
Merge branch 'master' into new-init

Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
	processing/src/main/java/io/druid/guice/PropertiesModule.java
	server/src/main/java/io/druid/initialization/Initialization.java
Merge branch 'master' into new-init

Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
Merge branch 'druid-0.7.x' into new-init
fix dependencies
Merge branch 'druid-0.7.x' into new-init

Conflicts:
	examples/config/historical/runtime.properties
	examples/config/overlord/runtime.properties
	examples/config/realtime/runtime.properties
fix assembly file
Merge pull request #600 from metamx/new-init

Properties module can now take multiple properties files