Merge branch 'master' of https://github.com/P-Costa/BetterWeather into P-Costa-master

Conflicts:
	betterweather/src/main/res/values-pt/pref_strings.xml