fixed so many things
Merge branch 'master' of github.com:maxko87/push_to_learn

Conflicts:
	bin/PushToLearn.apk
	bin/classes.dex
	bin/classes/com/greylock/MyCard.class
	bin/dexedLibs/cardsuilib-858e684f21703e5abfd363756d07b3fa.jar
	bin/dexedLibs/nineoldandroids-2.4.0-9ade99299548c5994fa8dedb4feac6ad.jar
	bin/resources.ap_