Menu Activity
Merge branch 'master' of https://github.com/Noskire/Transporte

Conflicts:
	bin/AndroidManifest.xml
	bin/classes/com/example/transporte/R$id.class
	bin/classes/com/example/transporte/R$layout.class
	bin/classes/com/example/transporte/R$menu.class
	bin/classes/com/example/transporte/R$string.class
	bin/classes/com/example/transporte/R$style.class
	res/values/strings.xml