Revert "малясь доделал!"

This reverts commit 15047062a8da165944ba89caf838bf1293d8be19.
Uncommitted changes to reload project
Merge remote-tracking branch 'origin/master'

Conflicts:
	NPO/NPO.pro.user
	NPO/main2.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	NPO/NPO.pro.user
	NPO/main2.cpp
Merge branch 'master' of https://github.com/NII-APP/NPO