0825 cropImg setting(listView)
Merge branch 'ylc'
0825 merge history and dial / add mode when scan
Merge branch 'lowlow'

Conflicts:
	AndroidManifest.xml