Clean up after merge.

Removes menu.xml.orig and strings.xml.orig, fucking up my eclipse.
Adds a break in UnisonMenu, lost during merge of groupHistory with dev/solo; formats the file.