cleanup
Merge branch 'master' of https://github.com/ning-yu/system7070

Conflicts:
	a.test.xml