Commeeeeeeeeeeeeeeeeeeeentssssssssss

AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hearts/bin/Hearts.apk
	Hearts/bin/classes.dex