Merge branch 'tacs2014-master'
Merge branch 'master' of git://github.com/tacs2014/muralCliente
Implementação da lista de compromissos através de cards
Merge pull request #53 from jullianonascimento/master

merge jullianonascimento-master into pr43
revert gitignore
Merge branch 'integration' of https://github.com/tacs2014/muralCliente into upstream-integration

Conflicts:
	CentralUFG/app/src/main/res/values/strings.xml
Merge pull request #62 from jullianonascimento/master

merge jullianonascimento-master into pr43
Merge pull request #63 from tacs2014/pr43

merge pr43 into integration