Merge branch 'master' into Felipeco
proyectos comentario half
Merge branch 'master' into oscar

Conflicts:
	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/dominio/adaptadores/experiencias/CustomAdapterExperiencias.class
	IncluApp/bin/classes/co/gov/dps/incluapp/dominio/entidades/experiencias/fragments/ExperienciaFragment.class
	IncluApp/gen/co/gov/dps/incluapp/R.java
	includapp-RestFul/views/layout.ejs
fixing bugs
Agregado la videollamada

Agregado la videollamada
merge with felipe
intent filter bug fixed
added maps for all experience
merge with alexis