prim commit pe testBranch
test commit pe master
Merge branch 'master' into testBranch

Conflicts:
	sBlog.Net-Src-v1.0/sBlog.Net/Services/CacheService.cs
test2 pe testBranch
Merge branch 'testBranch'