changed setContentView to splash_page and play and settings direct to
the right views when clicked
Merge branch 'david3' into bea
Adjusted image button properties in splash and settings screens so
they fit better on small screens.
Added a listener to the play button animator so that game screen can be
loaded when the animation ends. Tweaked the rotation animation slightly.
Merge branch 'Ar' into david3
Fixed button listeners. And reorganized to have more specific methods
for showing views
Merge remote-tracking branch 'origin/bea' into bea

Conflicts fixed:
	sosgame1/res/layout/splash_page.xml
	sosgame1/src/com/example/sosgame1/MainActivity.java
Merge branch 'david3' into bea

Conflicts fixed:
	sosgame1/res/layout/settings_page.xml
Merge branch 'bea' into david4