Merge branch 'Update'

Conflicts:
CoolCalc.userprefs
CoolCalc2/bin/Debug/CoolCalc2.exe
CoolCalc2/bin/Debug/CoolCalc2.exe.mdb
CoolCalc2/obj/x86/Debug/CoolCalc2.exe
CoolCalc2/obj/x86/Debug/CoolCalc2.exe.mdb