Merge branch 'master' into data-saving

Conflicts:
	projectfiles/QtCreator/TOX-Qt-GUI.pro