bug fixes and cleanup#3

israpps merged 6 commits into

israpps:windowsisrapps/udpbd-server:windowsfrom

MegaBitmap:test2-25-9-7MegaBitmap/udpbd-server:test2-25-9-7Copy head branch name to clipboard