Updated a ton of stuff.
Merge remote-tracking branch 'origin/master'

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