alex, andrei: readded xml files
alex, andrei removed webmvc because tests were failing
Merge branch 'fixtest'