Added music to the activities (separately)
Merge remote-tracking branch 'origin'

Conflicts:
	bin/classes/scrabble/rabble/R$string.class
	gen/scrabble/rabble/R.java
	src/scrabble/rabble/BoardActivity.java
	src/scrabble/rabble/ClientActivity.java
	src/scrabble/rabble/MainActivity.java