etf
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyBill.v12.suo
	MyBill/bin/MyBill.dll
	MyBill/bin/MyBill.pdb
	MyBill/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MyBill/obj/Debug/MyBill.csproj.FileListAbsolute.txt
	MyBill/obj/Debug/MyBill.csprojResolveAssemblyReference.cache
	MyBill/obj/Debug/MyBill.dll
	MyBill/obj/Debug/MyBill.pdb