Login y sus amigos v1
Ultimo
Merge branch 'safe1'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/org/sca/sca/R$color.class
	bin/classes/org/sca/sca/R$dimen.class
	bin/classes/org/sca/sca/R$drawable.class
	bin/classes/org/sca/sca/R$id.class
	bin/classes/org/sca/sca/R$layout.class
	bin/classes/org/sca/sca/R$menu.class
	bin/classes/org/sca/sca/R$string.class
	bin/classes/org/sca/sca/R$style.class
	bin/classes/org/sca/sca/adapters/NavDrawerListAdapter.class
	bin/classes/org/sca/sca/controllers/MainActivity$1.class

bin/classes/org/sca/sca/controllers/MainActivity$SlideMenuClickListener.
class
	bin/classes/org/sca/sca/controllers/MainActivity.class
	bin/classes/org/sca/sca/fragments/EventDetailFragment.class
	bin/classes/org/sca/sca/fragments/EventsFragment$Task.class
	bin/classes/org/sca/sca/fragments/EventsFragment.class
	bin/classes/org/sca/sca/fragments/FindPeopleFragment.class
	bin/classes/org/sca/sca/fragments/PhotosFragment.class
	bin/classes/org/sca/sca/fragments/ProfileFragment.class

bin/classes/org/sca/sca/fragments/RegionListFragment$RegionListAdapter.c
lass
	bin/classes/org/sca/sca/fragments/RegionListFragment.class
	bin/classes/org/sca/sca/fragments/RegionsDetailFragment.class
	bin/classes/org/sca/sca/fragments/WhoWeAreFragment.class
	bin/resources.ap_
	gen/org/sca/sca/R.java