Java client.
Merge branch 'master' of github.com:hilfialkaff/storm-elasticity-scheduler

Conflicts:
	src/jvm/storm/scheduler/ElasticityScheduler.java
Merge branch 'master' of github.com:hilfialkaff/storm-elasticity-scheduler

Conflicts:
	src/jvm/storm/scheduler/ElasticityScheduler.java