Home is ready. search field pending. SOme publisher texts on home page
missing.
added files to gitignore
Merge branch 'dev' of https://github.com/SIB-Colombia/sib-dataportal
into dev

Conflicts:
	portal-web/src/main/webapp/WEB-INF/classes/messages_es.properties
	portal-web/src/main/webapp/WEB-INF/jsp/frontPageHeadContent.jsp
	portal-web/src/main/webapp/WEB-INF/jsp/header.jsp
	portal-web/src/main/webapp/WEB-INF/jsp/menu/mainMenu.jsp
	portal-web/src/main/webapp/WEB-INF/jsp/menu/topMenu.jsp
	portal-web/src/main/webapp/WEB-INF/jsp/publisher/headcontent.jsp
	portal-web/src/main/webapp/WEB-INF/jsp/publisher/introduction.jsp
	portal-web/src/main/webapp/layouts/frontPageMainLayout.jsp
	portal-web/src/main/webapp/skins/standard/images/conjuntos_ico.png
	portal-web/src/main/webapp/skins/standard/images/esp_ico.png
	portal-web/src/main/webapp/skins/standard/images/publicadores_ico.png
	portal-web/src/main/webapp/skins/standard/speciesGlobal.css
added missing publishers text
Including ignore sublime project file
Eliminating invalid files