Corrigindo métodos de search para Dropbox e GoogleDrive
Merge origin/develop into develop

Conflicts:
	CloudStar/CloudStar-ejb/src/java/com/cloudstar/search/SearchEngineBean.java
Merge origin/develop into develop

Conflicts:
	CloudStar/CloudStar-ejb/src/java/com/cloudstar/search/SearchEngineBean.java
Merge branch 'infrastructure' into beforeMerge
Merge branch 'develop' into beforeMerge

Conflicts:
	CloudStar/CloudStar-ejb/src/java/com/cloudstar/servicepersistence/mappers/FacebookChatsMapper.java
	CloudStar/CloudStar-war/src/java/com/cloudstar/controller/FacebookOAuthServlet.java
	CloudStar/CloudStar-war/web/Util/Google.json