Merge branch 'master' into eduardo
Merge branch 'eduardo' of https://github.com/ramirlm/PIUPIU into eduardo
Merge branch 'master' of https://github.com/ramirlm/PIUPIU into eduardo
Merge branch 'master' of https://github.com/ramirlm/PIUPIU into eduardo
Testes Funcionais
Merge branch 'eduardo' of https://github.com/ramirlm/PIUPIU into eduardo

Conflicts:
	src/test/java/info/noip/piupiu/functional/page/test/PiuPiuTest.java
correcao dos testes funcionais