Resolvendo conflitos
Merge branch 'master' of https://github.com/npi-ufc-qxd/gal.git

Conflicts:
	aplicacoes/gal_npi/.classpath
	aplicacoes/gal_npi/.settings/org.eclipse.jdt.core.prefs
	aplicacoes/gal_npi/.settings/org.eclipse.wst.common.project.facet.core.xml
Merge branch 'master' of https://github.com/npi-ufc-qxd/gal.git