fdsa
Merge remote-tracking branch 'origin/master'

Conflicts:
	TheDocIsIn/bin/TheDocIsIn.apk