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

Conflicts:
	Android/WebView/src/com/qualiom/hardware/FotoUpload.java