"#100"
#100
#100
Merge branch 'master' of https://github.com/Interbellum/collective_development

Conflicts:
	Docs/Architecture (ARC)/Architecture_project.doc
Изменено с учетом работы winxp по тикету 102 #100