Merge remote-tracking branch 'origin/master'

Conflicts:
	FatherCatchmas.userprefs
	FatherCatchmas/AppMain.cs
	FatherCatchmas/FatherCatchmas.pidb
	FatherCatchmas/Present.cs
	FatherCatchmas/bin/Debug/FatherCatchmas-unsigned/Application/app.exe

	FatherCatchmas/bin/Debug/FatherCatchmas-unsigned/Application/app.exe.mdb
	FatherCatchmas/obj/Debug/app.exe
	FatherCatchmas/obj/Debug/app.pdb
	FatherCatchmas/obj/Debug/convertedpdb/app.exe.mdb