new button
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	mainwindow.cpp
	mainwindow.h
	mainwindow.ui
	otherapp.pro.user