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

Conflicts:
	app/src/main/res/layout/fragment_user_profile.xml
taxonomies ok actulitzant spinner al recuperarles del WS