backup
Merge branch 'master'
move sources to src directory
Merge branch 'master'
Merge branch 'master'

Conflicts:
	src/sim/refs/all.d
основные классы пользователей и персон
Merge branch '#3-Users'