2014-11-25-2
2014-11-25-3

Conflicts:
	ThinkPrint/ThinkPrint/TP.Service/TP.Service.csproj
	ThinkPrint/ThinkPrint/TP.Site/Web.config