some changes
Merge branch 'master' of github.com:pidgeonproject/pidgeon

Conflicts:
	Forms/Preferences/Highlighter.cs
	Protocols/Qt.cs