main activity
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/org/idr/notouch/app/analyzer/MainActivity.java