Lobby and Draw

Confine the draw space
Merge branch 'master' of https://github.com/mstuart/samsung-android-hackathon