Merge
Merge branch 'arno'

Conflicts:
	Program/TogetherIsBetter/TogetherIsBetter.v12.suo
	Program/TogetherIsBetter/TogetherIsBetter/bin/Debug/TogetherIsBetter.exe
	Program/TogetherIsBetter/TogetherIsBetter/bin/Debug/TogetherIsBetter.pdb
	Program/TogetherIsBetter/TogetherIsBetter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Program/TogetherIsBetter/TogetherIsBetter/obj/Debug/MainWindow.g.cs
	Program/TogetherIsBetter/TogetherIsBetter/obj/Debug/TogetherIsBetter.csproj.FileListAbsolute.txt
	Program/TogetherIsBetter/TogetherIsBetter/obj/Debug/TogetherIsBetter.csprojResolveAssemblyReference.cache
	Program/TogetherIsBetter/TogetherIsBetter/obj/Debug/TogetherIsBetter.exe
	Program/TogetherIsBetter/TogetherIsBetter/obj/Debug/TogetherIsBetter.pdb
	Program/TogetherIsBetter/TogetherIsBetter/obj/Debug/TogetherIsBetter_MarkupCompile.cache
	Program/TogetherIsBetter/TogetherIsBetter/obj/Debug/TogetherIsBetter_MarkupCompile.i.cache