Merged with new changes from Panut
Revert "Merged with new changes from Panut"

This reverts commit 7c28c941d58fdc5c2bc8917a1c1dae9a186439c6.
Merge branch 'develop' of https://github.com/nakautot/dirtyEd into develop