Agregado SMSObserver al proyecto
Merge remote-tracking branch 'origin/joaquin'

Conflicts:
	DataCollector/src/main/java/com/tesis/datacollector/MainActivity.java