guardo para que jaime no llore
Merge branch 'feat-refactoring'

Conflicts:
	src/cl/uchile/dcc/redes/traza/activities/DisplayMessageActivity.java