update 10/30
no message
Merge branch 'feature/andrey_changes' into develop

Conflicts:
	TabApp.pro.user
	mainwindow.cpp
	mainwindow.h