Acctivate versiune finala fara comunicatie
ceva
Merge remote-tracking branch 'upstream/master'

Conflicts:
	res/layout/activity_search.xml