Changes for report
Merge branch 'IDMAPPS-548'
Merge branch 'master' of https://github.com/OpenIAM/openiam-idm-ce
dummy, not to be checked in
Merge branch 'master' of https://github.com/OpenIAM/openiam-idm-ce
Changes for JBoss 7
Changes for JBoss 7
Merge branch 'IDMAPPS-578' of https://github.com/OpenIAM/openiam-idm-ce into IDMAPPS-578
Merge branch 'master' of https://github.com/OpenIAM/openiam-idm-ce

Conflicts:
	idm/idm-connector-core/.classpath
	idm/idm-connector-intf/.classpath
	idm/openiam-idm-services/.classpath
Merge branch 'master' of https://github.com/OpenIAM/openiam-idm-ce

Conflicts:
	idm/idm-connector-core/src/main/java/org/openiam/spml2/spi/common/UserFields.java
	idm/idm-connector-core/src/main/java/org/openiam/spml2/spi/csv/AbstractCSVCommand.java
	idm/idm-connector-core/src/main/java/org/openiam/spml2/spi/csv/AbstractCSVParser.java
	idm/idm-connector-core/src/main/java/org/openiam/spml2/spi/csv/AddCSVCommand.java
	idm/idm-connector-core/src/main/java/org/openiam/spml2/spi/csv/CSVConnectorImpl.java
	idm/idm-connector-core/src/main/java/org/openiam/spml2/spi/csv/LookupCSVCommand.java
	idm/idm-connector-core/src/main/java/org/openiam/spml2/spi/csv/ModifyCSVCommand.java
	idm/idm-connector-core/src/main/java/org/openiam/spml2/spi/csv/TestCSVCommand.java
	idm/idm-connector-core/src/main/java/org/openiam/spml2/spi/csv/UserCSVParser.java
	idm/idm-connector-core/src/main/resources/connector-coreContext.xml
	idm/openiam-idm-services/src/main/java/org/openiam/provision/service/DefaultProvisioningService.java
	idm/openiam-reportviewer/pom.xml
	idm/openiam-selfservice/src/main/java/org/openiam/selfsrvc/reports/SubscribeReportsController.java
	idm/openiam-selfservice/src/main/webapp/WEB-INF/selfserve-servlet.xml
	idm/openiam-selfservice/src/main/webapp/WEB-INF/struts-config.xml
	idm/openiam-selfservice/src/main/webapp/pub/search.jsp
	idm/openiam-webconsole/src/main/java/org/openiam/webadmin/res/AttributeMapController.java
	idm/openiam-webconsole/src/main/java/org/openiam/webadmin/role/GroupRoleController.java
	idm/openiam-webconsole/src/main/java/org/openiam/webadmin/role/RoleResourceController.java
	idm/openiam-webconsole/src/main/java/org/openiam/webadmin/role/UpdateRoleMembershipController.java
	idm/openiam-webconsole/src/main/webapp/WEB-INF/cnt-servlet.xml
	idm/openiam-webconsole/src/main/webapp/role/roleresource.jsp
	schema-idm/rdbms/03_mysql_idm_data.sql
	schema-idm/rdbms/oracle_idm_data.sql