Revert "Merge branch 'master' of https://github.com/Thainq/DDProject"

This reverts commit 1a70f3adb9b7bae23faed2f306b39ff2bbd86409, reversing
changes made to f1c976eb49affbb570b17ad16e274b82307834d9.
17:09

Revert merge conflit