2014-11-26-4
2014-11-26-5

Conflicts:
	ThinkPrint/ThinkPrint/TP.Site/TP.Site.csproj
Merge branch 'master' of https://github.com/PrintTeam/PrintSolution