as
Merge branch 'versao1.1' of https://github.com/UFC-Quixada-FBD2014-2/TrabalhoFBD into versao1.1