By felipe
Merge branch 'master' of https://github.com/saraivaufc/ListaDeCompras

Conflicts:
	SisCompra/SisCompra.pro.user