init
alter
Merge branch 'master' of https://github.com/eduardofelipevieira/manolo-mobile

Conflicts:
	AndroidManifest.xml
	bin/Manolo.apk
	bin/classes.dex
	bin/classes/com/manolo/app/DataAccess.class
	bin/classes/com/manolo/app/MainActivity$1.class
	bin/classes/com/manolo/app/MainActivity$MapSectionFragment.class
	bin/classes/com/manolo/app/MainActivity$PromoSectionFragment.class
	bin/classes/com/manolo/app/MainActivity$SectionsPagerAdapter.class
	bin/classes/com/manolo/app/MainActivity.class
	bin/dexedLibs/google-play-services_lib-7cb32caaac505f977d7ac28ff372b1e6.jar
	bin/resources.ap_
	src/com/manolo/app/DataAccess.java
	src/com/manolo/app/MainActivity.java
alter