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
Merge pull request #29 from ramirlm/ugo

Ignoring functional tests to run build on Jnekins.
Cosulta por hashtag
correcao dos testes funcionais
Merge branch 'master' of https://github.com/ramirlm/PIUPIU into uira
Corrigindo profile do usuario logado na visualização da consulta de hashtags
Merge pull request #30 from ramirlm/uira

Cosulta por hashtag
Merge pull request #31 from ramirlm/eduardo

Atividade ok.
Adicionando encurtador de links
Correção para teste não falhar.
Implementando o highlight das urls
Corrigindo a disposicao da div
Merge pull request #32 from ramirlm/luis

Adicionando encurtador de links
Removendo peep.
Resolvendo os conflitos.