a

aa
Merge remote-tracking branch 'origin/master'

Conflicts:
	GAKeyboard/GAKeyboard.v12.suo
	GAKeyboard/GAKeyboard/Modules/GALayoutGenerator/Analyzer.cs
	GAKeyboard/GAKeyboard/bin/Debug/GAKeyboard.exe
	GAKeyboard/GAKeyboard/bin/Debug/GAKeyboard.pdb
	GAKeyboard/GAKeyboard/obj/Debug/GAKeyboard.csproj.GenerateResource.Cache
	GAKeyboard/GAKeyboard/obj/Debug/GAKeyboard.exe
	GAKeyboard/GAKeyboard/obj/Debug/GAKeyboard.pdb