update v 1.2
test 1.1
Merge branch 'v1.2'

Conflicts:
	mainwindow.cpp
test master