xxx
Izvestaj
Merge branch 'master' into Moduli

Conflicts:
	.gitignore
	FleetManager.sln
dfs