normal commit
Merge branch 'master' of https://github.com/GuoZhiyong/navtex_qt

Conflicts:
	NavtexItem_widget.cpp
	test_widget.pro.user
normal commit