add basic build integration with Ant
fix merge conflicts