teste
Merge branch 'master' of https://github.com/josefernandotolentino/mar-net-ram

Conflicts:
	Android/FotoDez/project.properties