il nulla cosmico
Merge remote-tracking branch 'origin/master'

Conflicts:
	HSA/res/layout/fragment_search.xml
	HSA/res/layout/gridview_item.xml