Merge branch 'refs/heads/electronicmap-core' into electronicmap
Добавлена поддержка Masqarade
Merge branch 'refs/heads/dev' into electronicmap

Conflicts:
	QtMon.pro
Merge branch 'refs/heads/electronicmap' into electronicmap-core