ignorando
criando layout
injetando dependencias do spring no jsf
removendo target
removendo target
Merge branch 'master' of
https://github.com/sfohart/mestrado-ufba-pesquisa-orientada

Conflicts:
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/BaseRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohAccountRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohAnalysisLanguageRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohAnalysisLanguagesRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohAnalysisRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohCrawlerLanguageRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohCrawlerProjectRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohCrawlerStackRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohLanguageRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohLicenseRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohProjectRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohStackRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/repository/impl/OhLohTagRepositoryImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/service/base/BaseOhLohService.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/service/impl/BaseOhLohServiceImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/service/impl/OhLohAccountServiceImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/service/impl/OhLohAnalysisServiceImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/service/impl/OhLohLanguageServiceImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/service/impl/OhLohProjectServiceImpl.class
	pesquisa-orientada/mestrado-crawler/target/classes/br/ufba/dcc/mestrado/computacao/service/impl/OhLohStackServiceImpl.class
	pesquisa-orientada/mestrado-web/src/main/java/br/ufba/dcc/mestrado/computacao/web/MainManageBean.java
	pesquisa-orientada/mestrado-web/src/main/resources/applicationContext.xml
	pesquisa-orientada/mestrado-web/src/main/webapp/WEB-INF/web.xml
	pesquisa-orientada/mestrado-web/src/main/webapp/css/style.css
	pesquisa-orientada/mestrado-web/src/main/webapp/layout/header.xhtml
	pesquisa-orientada/mestrado-web/src/main/webapp/results.xhtml