Merge branch 'master' into david4
Merge branch 'david3' into david4
Merge branch 'bea' into david4
Merge branch 'david3' into david4
Temporary save
Merge remote-tracking branch 'origin/master' into Ar

Conflicts:
	sosgame1/src/com/example/sosgame1/GLESSurfaceView.java
	sosgame1/src/com/example/sosgame1/MainActivity.java
Logic Update
Various changes.
Merge branch 'david3' into david4
Merge branch 'Ar' into david4

Conflicts fixed:
	sosgame1/src/com/example/sosgame1/controller/LogicControl.java
Merge remote-tracking branch 'origin/master' into bea

Conflicts:
	sosgame1/src/com/example/sosgame1/MainActivity.java