deleted meta data folder, git ignore update, xml parser
merge resolved