Signed-off-by: esdras <servoesdras@gmail.com>
Merge branch 'master' of https://github.com/OxeCorporation/Scrumming.git
Merge branch 'master' of https://github.com/OxeCorporation/Scrumming.git
Merge branch 'master' of https://github.com/OxeCorporation/Scrumming.git
Merge branch 'master' of https://github.com/OxeCorporation/Scrumming.git
Algumas coisas do usuario

Signed-off-by: esdras <servoesdras@gmail.com>
Merge branch 'master' of https://github.com/OxeCorporation/Scrumming.git

Conflicts:
	trunk/source/Scrumming-web/src/main/java/br/com/scrumming/domain/FuncionarioEmpresa.java

Signed-off-by: esdras <servoesdras@gmail.com>
Merge branch 'master' of https://github.com/OxeCorporation/Scrumming.git
Merge branch 'master' of https://github.com/OxeCorporation/Scrumming.git
Pagina inicial com o login 

Signed-off-by: esdras <servoesdras@gmail.com>