Updated composer and build.xml