basura
Merge branch 'master' of https://github.com/RescueInCloud/RescueInCloud-Android

Conflicts:
	RescueInCloud/res/raw/rescue_lite_db