Fixed NPE in NumberSelectScreen

Whoops, should have switched and done this fix here, then merged to
story.  There might be a conflict now, but it's the same fix.
Merge branch 'master' of https://github.com/thomaswp/tuxblocks
Update TODO.md
Merge remote-tracking branch 'origin/master' into story_new_gui