friend list, unfriending
stuff
Merge branch 'master' of
https://github.com/BrainTrainSite/BrainTrain.git

Conflicts:
	WebContent/Profile.jsp