some changes are made to make it better.
Merge branch 'master' of https://github.com/Zurcan/ASCUM_ARM

Conflicts:
	mainwindow.cpp
	mainwindow.h