Pesquisa melhorada
Merge origin/develop into develop

Conflicts:
	CloudStar/CloudStar-ejb/build/classes/com/cloudstar/services/GenericIMAPService.class
	CloudStar/CloudStar-ejb/src/java/com/cloudstar/services/GenericIMAPService.java
	CloudStar/dist/gfdeploy/CloudStar/CloudStar-ejb_jar/com/cloudstar/services/GenericIMAPService.class
	CloudStar/lib/.DS_Store