Ajustes no layout dos cartoes.
Merge branch 'integration' of https://github.com/tacs2014/muralCliente into upstream-integration

Conflicts:
	CentralUFG/app/build.gradle
	CentralUFG/app/src/main/java/muralufg/fabrica/inf/ufg/br/centralufg/main/MainActivity.java
	CentralUFG/app/src/main/java/muralufg/fabrica/inf/ufg/br/centralufg/util/ServiceCompliant.java
	CentralUFG/app/src/main/res/values/colors.xml
Merge pull request #60 from geovane1992/master

merge geovane1992-master into pr56
Merge pull request #61 from tacs2014/pr56

merge pr56 into integration