1
Merge remote-tracking branch 'origin/master'

Conflicts:
	GeneralClasses/GeneralClasses.v12.suo
	GeneralClasses/bin/Debug/GeneralClasses.dll
	GeneralClasses/bin/Debug/GeneralClasses.pdb
	GeneralClasses/obj/Debug/GeneralClasses.dll
	GeneralClasses/obj/Debug/GeneralClasses.pdb