recovered the Lobby layout
changed layout of Lobby and changed Lobby to extend ListActivity
add button worked
fixed conflict
Merge branch 'master' of https://github.com/dsouzarc/snapshot