test

test1
Create Regions Layout

Se creo Layout para las regiones
Eventos 1
eventos 2
Eventos 3
Merge branch 'pacho'

Conflicts:
	.classpath
	bin/MainActivity.apk
	bin/classes.dex
	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/dexedLibs/android-support-v4-c7122b930ca8b716dc99dcb983d05584.jar
	bin/resources.ap_
	gen/org/sca/sca/R.java
Merge remote-tracking branch 'origin/Safe'

Conflicts:
	.classpath
	bin/MainActivity.apk
	bin/classes.dex
	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/dexedLibs/android-support-v4-c7122b930ca8b716dc99dcb983d05584.jar
	bin/resources.ap_
	gen/org/sca/sca/R.java
Merge Funcionando
Trabajo del Viernes SAFE
commit test
Merge branch 'master' of https://github.com/frank0ch0a/SCA

Conflicts:
	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/controllers/RegionsDetailFragment.class
Pacho

Agregue modelos de eventos,concursos,arquitectos, agregue el frame de
detalle evento
test
Noticias Ready
Funcionalidad en eventos y concursos
Internas de evento y de concursos
Adicion de detalle de regines y detalle de arquitectos.
Merge branch 'master' into pacho