Backupcommit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Eclipse/DareU/bin/classes/com/phonezilla/dareu/R$string.class
	Eclipse/DareU/bin/classes/com/phonezilla/dareu/R$style.class

	Eclipse/DareU/src/com/phonezilla/dareu/schermen/grouppackage/challenge/ChallengeDetails.java