Fixed problems with variable names.
A lot of git stuff...

Conflicts:
	src/nxt_qt/include/nxt_qt/MouseMonitorWindow.hpp
	src/nxt_qt/src/MouseMonitorWindow.cpp
	src/nxt_qt/ui/mousemonitor_window.ui