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

Conflicts:
	Instalador/Instalador.pro.user
	Instalador/filemanager.cpp
	Instalador/macros.h
	SisCompra/SisCompra.pro.user
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/SisCompra.exe
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/compra.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/controladordosistema.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/dialogeditarcompra.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/dialogeditarproduto.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/gerenciadordearquivos.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/gerenciadordecompras.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/main.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/mainwindow.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/moc_controladordosistema.cpp
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/moc_controladordosistema.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/moc_dialogeditarcompra.cpp
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/moc_dialogeditarcompra.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/moc_dialogeditarproduto.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/moc_mainwindow.cpp
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/moc_mainwindow.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/debug/produto.o
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/ui_dialogeditarproduto.h
	build-SisCompra-Desktop_Qt_5_2_1_MinGW_32bit-Debug/ui_mainwindow.h
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/SisCompra
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/compra.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/controladordosistema.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/dialogeditarcompra.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/dialogeditarproduto.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/gerenciadordearquivos.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/gerenciadordecompras.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/main.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/mainwindow.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/moc_controladordosistema.cpp
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/moc_controladordosistema.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/moc_dialogeditarcompra.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/moc_dialogeditarproduto.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/moc_mainwindow.cpp
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/moc_mainwindow.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/produto.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/qrc_Imagens.cpp
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/qrc_Imagens.o
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/ui_dialogeditarproduto.h
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/ui_mainwindow.h