Swap 'flip' and 'rotate' in the Char View Tools palette
Move Knife and Ruler up in the Char View Tools Palette
Move Pen and Spiro up in the Char View palette
Merge https://github.com/fontforge/fontforge

Conflicts:
	fontforge/cvpalettes.c