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

Conflicts:
	Android/WebView/project.properties
	Android/WebView/src/com/qualiom/app/autoscan/MainActivity.java
Merge branch 'master' of https://github.com/joseaugustoneto/mar-net-ram-version-2

Conflicts:
	Android/WebView/src/com/qualiom/app/autoscan/MainActivity.java