Music stop/resume in all activities
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameActivity/src/edu/harding/AndroidPentago/SettingsActivity.java