local changes
conflicts resolved
FIXME: audiobuffer to 0 and to use img in dragablecontrol as dragable shape
Merge branch 'master' of https://github.com/Vonflaken/u-gine