Friendlist alphabetically sorted
Merge remote-tracking branch 'origin/master'
Update query modified
Merge remote-tracking branch 'origin/master'

Conflicts:
	AlmendeMotivator/src/alm/motiv/AlmendeMotivator/ChallengeEvidence.java