Add pack-api target to Ant
fix merge conflicts