languages
Merge branch 'master' of github.com:identitat/farmacies-android

# By lluisruscalleda
# Via lluisruscalleda
* 'master' of github.com:identitat/farmacies-android:
  ajustos Ws

Conflicts:
	app/src/main/res/values/strings.xml