Merge pull request #2 from AAROC/master

Making changes to the jsp pages for a generic master
Merge pull request #3 from AAROC/master

Final pull request for v1.1.0
Generalised several pages
Merge branch 'master' of github.com:INFN-Catania/IDPPublic

Conflicts:
	web/about.jsp
	web/documentation.jsp
Merge pull request #11 from INFN-Catania/master

Cleaned Pages and config