Fixed compilation errors and made it compile mvn package
Merge branch 'master' of github.com:jbalonso/storm-hackathon

w00t