Merge remote-tracking branch 'origin/Ar' into david3
Merge remote-tracking branch 'origin/bea'
Merge branch 'bea' into david3
Added pop-ups (AlertDialogs) for Multiplayer option.
Added a check for a null surfaceview in onPause in case the game is
paused before the surfaceview is instantiated.
Merge branch 'david3' into david4
Merge remote-tracking branch 'origin/bea' into david4