Added more fixtures for scaffold-simple test project.
Implemented XML merging.
Added string.xml scaffold with merging capabilities.
Improved scaffold test project to include string.xml.