Fixed Eclipse warnings
Fix for issue #214: Ant build does not include *.vm files in azkaban jar
Merge pull request #215 from erwa/fix-ant

Fix for issue #214: Ant build does not include *.vm files in azkaban jar
Resolve merge conflicts.