Un ultimo commit
Merge branch 'master' of https://github.com/RescueInCloud/RescueInCloud-Android

Conflicts:

	RescueInCloud/src/es/ucm/ric/activities/fragments/FragmentNuevoProtocolo.java