Versao com a parte web (incompleta).
Versao com a parte web (incompleta). [2]
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/fragment_search.xml