fixed assorted bugs related to activities
Merge github.com:ldanielw1/cs160-mSpray

Conflicts:
	src/edu/berkeley/cs160/mSpray/ConfirmNoSpray.java
	src/edu/berkeley/cs160/mSpray/OtherChemicalUsedActivity.java
	src/edu/berkeley/cs160/mSpray/SecondChemicalUsedActivity.java