San
Merge branch 'master' of https://github.com/treningit/OurGroupRepozitory

Conflicts:
	SiteCatalog/SiteCatalog.v11.suo