Intento de arreglar Conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/drawable-hdpi/preferences_button.png
	res/layout/home_tab.xml