adding glassfish-embedded
remove unneeded files
fix conflicts