add Map and buttons in main_activity. I created 3 news activities: contact, group and settings
I added the current location: now we have the user's latitude/longitude. I added layout-land folder for landscape mode and I did it for activity_main.xml
commit
add spinner to choose map type
add gitignore
solve bug with layout-land for mainactivity
Merge branch 'develop' of github.com:God3us/FindMe into develop
Add Dialog box with Intent to call and send sms
Update .gitignore
Update .gitignore
pull de develop. primera vez
add layouts
Merge branch 'develop' of github.com:God3us/FindMe into develop
.gitignore is now working
Merge branch 'develop' of github.com:God3us/FindMe into carlosRG_Develop

Conflicts:
	bin/FindMe.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/adm/findme/R$style.class
	bin/classes/com/adm/findme/R$styleable.class
	bin/dexedLibs/google-play-services_lib-64db94058ad54969c76530d4d6017908.jar
	bin/resources.ap_
	gen/com/adm/findme/R.java
Merge branch 'develop' of https://github.com/God3us/FindMe into poxo
yi
Merge branch 'develop' of https://github.com/God3us/FindMe into poxo

Conflicts:
	.gitignore
	.settings/org.eclipse.jdt.core.prefs
	project.properties
Google Maps API Key
Merge branch 'develop' of https://github.com/God3us/FindMe into poxo

Conflicts:
	project.properties