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

Conflicts:
	build.xml
	target/alarm-storm.jar
Merge branch 'master' of https://github.com/tellesnobrega/alarm-storm