cmmt
Merge branch 'master' of
https://github.com/joseaugustoneto/mar-net-ram-version-2

Conflicts:
	Android/AutoScan/src/com/qualiom/hardware/Backend.java