fixed up the userprofileactivity stuff
Merge branch 'master' of github.com:nhvtgd/STEMPLUSPLUS

Conflicts:
	src/mit/edu/stemplusplus/UserProfileActivity.java