.
Query com filtro implantada
Merge branch 'master' of https://github.com/thiagofrohlich/android

Conflicts:
	CasaMinha/gen/com/ufpr/casaminha/R.java
	CasaMinha/src/com/ufpr/casaminha/controller/Buscar.java
	CasaMinha/src/com/ufpr/casaminha/controller/DatabaseConnector.java
	CasaMinha/src/com/ufpr/casaminha/controller/Inserir.java