Configuracion Unidades Metricas
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/penadieg/sunshine/ForecastFragment.java
	app/src/main/java/com/example/penadieg/sunshine/SettingsActivity.java
	app/src/main/res/values/strings.xml
	app/src/main/res/xml/pref_general.xml