Merge branch 'master' of https://github.com/tellesnobrega/alarm-storm

Conflicts:
	bin/alarm/spout/ConsumptionSpout.class
	src/alarm/spout/ConsumptionSpout.java
Merge branch 'master' of https://github.com/tellesnobrega/alarm-storm