Merge remote-tracking branch 'origin/Ar' into david3
Merge branch 'bea' into david3
Merge remote-tracking branch 'origin/master'
Added a check for a null surfaceview in onPause in case the game is
paused before the surfaceview is instantiated.
Merge remote-tracking branch 'origin/bea' into david3
Merge branch 'david3'
Merge remote-tracking branch 'origin/bea' into david3
Fixed credits removal from settings screen.
Merge branch 'david3'
Fixed another glitch in credits removal.
Merge branch 'david3'
Several changes to the view adjustment code/view.
Important note: All views MUST have different names and be stored in
different variables otherwise we cannot properly add and remove views.
Merge branch 'david3'
Added a handler for onBackPressed so that if the user presses back while
in the settings screen they go back to the game instead of exiting.
Merge branch 'david3'
Added handling back button for view adjust view.
Merge branch 'david3'
Merge remote-tracking branch 'origin/master' into bea