added java metadata files
more config
merging from remote