fix bugs
Merge remote-tracking branch 'origin/f-roadmap-2013' into f-roadmap-2013

Conflicts:
	Plugins/Accessibility/SimpleSkin/KeyboardDisplayer.cs
fix conflict merge