26,09,2014
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	mainwindow.cpp
	operwindow.cpp
! количество проживающих
ver 1.7.2
Ver 1.7.2
28.10
Merge branch 'master' into new_design

Conflicts:
	adminwindow.ui
	mainwindow.cpp
	operwindow.cpp
	operwindow.ui
! доработан инсталлер
кнопочка