Create Event Added

New Activity Added
Adding new files for events and QR Lector
live comments added
merge alexis bugs fixed
Merge branch '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
cambio interfaz grafica
Merge branch 'master' of https://github.com/ReyesMagos/IncluAPP
Adding Timeline and others features
proyectos comentario half
Merge remote-tracking branch 'origin/alexis'

Conflicts:
	IncluApp/gen/co/gov/dps/incluapp/R.java
	IncluApp/src/co/gov/dps/incluapp/dominio/entidades/factory/experiencias/FactoryExperiencias.java
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
merge with felipe
intent filter bug fixed
Merge branch 'master' into Felipeco
Agregado mas proyectos y push service

Agregado mas proyectos y push service