added getUserHasAchievement
making stats for admin in progress
Merge branch 'master' of
https://github.com/BrainTrainSite/BrainTrain.git

Conflicts:
	WebContent/admin.jsp
getUserIsDeleted method