ignore
expiriences adaptors added
user added
Factory Expirience Added
Merge remote-tracking branch 'origin/alexis'
Merge branch 'oscar'

Conflicts:
	IncluApp/AndroidManifest.xml
	IncluApp/bin/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/gen/co/gov/dps/incluapp/R.java
	IncluApp/res/values/strings.xml
merge bugs fixed