Remove unnecessary xml, update strings
Merge branch '9patch'