fixed errors with missing methods getTos() in parsedemailresult
Merge remote-tracking branch 'origin/ry' into ry

Conflicts:
	android/android.iml
	app/app.iml
	app/build.gradle
	app/src/main/res/layout/direct_scanner.xml