12
Merge branch 'v1.2'

Conflicts:
	mainwindow.cpp