switch test
add page to specify whether or not you have a certificate. In this last
case opens an iframe to communicate with the CA-Online Bridge
Now the portlet use the PortalUserDBAPI
updates
Add remove proxy from myproxy server functionality
Add CA request page
Save changes
deleted jsp error
Solve same problem
commit
Merge branch 'master' into CAonlineSupport

Conflicts:
	src/main/java/portal/registration/controller/AddFqansController.java
	src/main/java/portal/registration/controller/AddUserInfoController.java
	src/main/java/portal/registration/controller/AddUserToVoPresentsController.java
	src/main/java/portal/registration/controller/EditUserInfoController.java
	src/main/java/portal/registration/controller/EditUserToVoController.java
	src/main/java/portal/registration/controller/UploadCertController.java
	src/main/webapp/WEB-INF/jsp/addUserToVoPresents.jsp
	src/main/webapp/WEB-INF/jsp/admin-cert-action.jsp
	src/main/webapp/WEB-INF/jsp/editUserInfoForm.jsp
commit
New flow if the user select a CAonline certificate.
Solved problem with org-dn
Merge branch 'master' into CAonlineSupport

Conflicts:
	src/main/webapp/WEB-INF/jsp/addUserInfoForm.jsp
	src/main/webapp/WEB-INF/jsp/editUserInfoForm.jsp
	src/main/webapp/WEB-INF/jsp/uploadCert.jsp
Edit GUI
switch to master for adjustament
Merge remote branch 'origin/master' into CAonlineSupport

Conflicts:
	src/main/webapp/WEB-INF/jsp/VOList.jsp
	src/main/webapp/WEB-INF/jsp/addUserToVOForm.jsp
	src/main/webapp/WEB-INF/jsp/addUserToVoPresents.jsp
	src/main/webapp/WEB-INF/jsp/editUserInfoForm.jsp
	src/main/webapp/css/main.css
Added feature:
if the user's certificate was released from CAonline the user can't
modify certificate or VO settings
Added advanced option with email notification on proxy timeleft under 1
hour and 30 minutes