Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	web/index.xhtml
Merge origin/master

Conflicts:
	src/java/model/Empresa.java
	web/index.xhtml