test
Merge remote-tracking branch 'origin/master'

Conflicts:
	Tools/src/com/zdm/tools/MainActivity.java