shiet
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ClassMarks.apk
	bin/classes.dex
	bin/classes/com/tfd/classmarks/Principal$3.class
	bin/classes/com/tfd/classmarks/Principal$4.class
	bin/classes/com/tfd/classmarks/Principal$5.class
	bin/classes/com/tfd/classmarks/Principal$6.class
	bin/classes/com/tfd/classmarks/Principal$7.class
	bin/classes/com/tfd/classmarks/Principal.class
	bin/resources.ap_