Merge branch 'master' of https://github.com/DreamInit/DiDj

Conflicts:
	dipoi.cpp
Revert "Fixed error after pull"

This reverts commit b9f36a1596e3446e99163971e55854aad13546f8.