busqueda TODO: arreglar sqls
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/nth/ikiam/adapters/BusquedaResultsFotosListAdapter.java
	src/com/nth/ikiam/db/FotoDbHelper.java