Sound and Music
Merge branch 'master' of https://github.com/PISProject/PISProject.git

Conflicts:
	src/com/ub/pis/activities/BaseActivity.java