menu test
Merge branch 'master' of https://github.com/joseaugustoneto/mar-net-ram-min

Conflicts:
	MenuTTest/.classpath
	MenuTTest/project.properties
	MenuTestTest/src/com/example/menu/test/MainActivityTest.java