Agregados el factory de Proyectos
expiriences timeline ready
Merge branch 'oscar'
show experiencie half
Maps

Masps
Maps

And street view
Merge remote-tracking branch 'origin/alexis'

Conflicts:
	.gitignore
	IncluApp/AndroidManifest.xml
	IncluApp/bin/classes/co/gov/dps/incluapp/R$id.class
	IncluApp/bin/classes/co/gov/dps/incluapp/R$layout.class
	IncluApp/bin/classes/co/gov/dps/incluapp/R$menu.class
	IncluApp/bin/classes/co/gov/dps/incluapp/R$string.class
	IncluApp/bin/classes/co/gov/dps/incluapp/R$style.class
	IncluApp/bin/classes/co/gov/dps/incluapp/TimelineActivity.class
	IncluApp/bin/classes/co/gov/dps/incluapp/presentacion/expericiencias/Experiencias.class
	IncluApp/gen/co/gov/dps/incluapp/R.java
	IncluApp/res/values/strings.xml
	IncluApp/src/co/gov/dps/incluapp/presentacion/NavigationActivityMain.java