small changes
Merge branch 'master' of https://github.com/molisani/sfs_mobile

Conflicts:
	sfs_mobile/src/edu/upenn/cis350/sfs_mobile/MyMessages.java