Adiciona arquivos do idea/android studio no gitignore
Módulo de cartões.
Merge branch 'geovane1992-master' into pr19

Conflicts:
	CentralUFG/.idea/misc.xml
	CentralUFG/app/app.iml
	CentralUFG/app/build.gradle
	CentralUFG/app/src/main/java/muralufg/fabrica/inf/ufg/br/centralufg/util/view/cartao/CartoesListFragment.java