Merge remote-tracking branch 'origin/master'

Conflicts:
	mainwindow.cpp
Revert "Check whistle"

This reverts commit 89d76e0766cb899d5ab34b9e8d360ac672f2fb2a.

Conflicts:
	DiDj.pro.user
	mainwindow.h
	mainwindow.ui
Merge branch 'master' of https://github.com/DreamInit/DiDj_DreamInit

Conflicts:
	mainwindow.cpp