minor changes commit
Merge branch 'master' of https://github.com/OpenGeoportal/OGP.git

Conflicts:
	geoportal_1/.classpath
	geoportal_1/pom.xml
	geoportal_1/src/main/java/org/OpenGeoPortal/Utilities/FilterServletOutputStream.java
	geoportal_1/src/main/webapp/resources/javascript/userInterface.js
	geoportal_1/target/maven-archiver/pom.properties