hi everyone
Merge branch 'master' of https://github.com/kicklassl/TalentDonation.git

Conflicts:
	bin/TalentDonation.apk
	bin/classes.dex
	bin/resources.ap_