[PLAT-3900] update database schema scripts as part of new UserMaster implementation

Conflicts:
	projects/OG-Bloomberg/OG-Bloomberg.iml
	projects/OG-BloombergExample/OG-BloombergExample.iml
	projects/OG-Client/OG-Client.iml
	projects/OG-Component/OG-Component.iml
	projects/OG-Engine/OG-Engine.iml
	projects/OG-Examples/OG-Examples.iml
	projects/OG-Financial/OG-Financial.iml
	projects/OG-Integration/OG-Integration.iml
	projects/OG-Language/OG-Language.iml
	projects/OG-LiveData/OG-LiveData.iml
	projects/OG-MasterDB/OG-MasterDB.iml
	projects/OG-MavenPlugin/OG-MavenPlugin.iml
	projects/OG-Parent/pom.xml
	projects/OG-Provider/OG-Provider.iml
	projects/OG-Security/OG-Security.iml
	projects/OG-Server/OG-Server.iml
	projects/OG-Util/OG-Util.iml
	projects/OG-UtilDB/OG-UtilDB.iml
	projects/OG-UtilDB/pom.xml
	projects/OG-Web/OG-Web.iml
[PLAT-3900] implemented UserMaster and RoleMaster and corresponding DB counterparties

Conflicts:
	projects/OG-Core/src/main/java/com/opengamma/core/user/impl/SimpleOGUser.java
	projects/OG-Master/src/main/java/com/opengamma/master/user/ManageableOGUser.java
	projects/OG-Master/src/main/java/com/opengamma/master/user/UserDocument.java
	projects/OG-Master/src/main/java/com/opengamma/master/user/UserSearchRequest.java
	projects/OG-MasterDB/src/main/java/com/opengamma/masterdb/user/DbUserMaster.java
	projects/OG-MasterDB/src/test/java/com/opengamma/masterdb/user/DbUserMasterTest.java
[PLAT-3909] Module signing and verifying capabilities

Conflicts:
	build.xml
	pom.xml
[PLAT-3913] Remote UserMaster

Conflicts:
	projects/OG-Master/src/main/java/com/opengamma/master/user/impl/DataUserMasterResource.java
	projects/OG-Master/src/main/java/com/opengamma/master/user/impl/DataUserResource.java
	projects/OG-Master/src/main/java/com/opengamma/master/user/impl/RemoteUserMaster.java
[PLAT-3888] Create Framework for testing RESTful resources

Conflicts:
	projects/OG-Analytics/OG-Analytics.iml
	projects/OG-Bloomberg/OG-Bloomberg.iml
	projects/OG-BloombergExample/OG-BloombergExample.iml
	projects/OG-Client/OG-Client.iml
	projects/OG-Component/OG-Component.iml
	projects/OG-Core/OG-Core.iml
	projects/OG-Engine/OG-Engine.iml
	projects/OG-Examples/OG-Examples.iml
	projects/OG-Financial/OG-Financial.iml
	projects/OG-Integration/OG-Integration.iml
	projects/OG-Language/OG-Language.iml
	projects/OG-LiveData/OG-LiveData.iml
	projects/OG-Master/OG-Master.iml
	projects/OG-MasterDB/OG-MasterDB.iml
	projects/OG-Maths/OG-Maths.iml
	projects/OG-MavenPlugin/OG-MavenPlugin.iml
	projects/OG-Provider/OG-Provider.iml
	projects/OG-Security/OG-Security.iml
	projects/OG-Server/OG-Server.iml
	projects/OG-Util/OG-Util.iml
	projects/OG-Util/pom.xml
	projects/OG-UtilDB/OG-UtilDB.iml
	projects/OG-Web/OG-Web.iml
[PLAT-3909] making the remote test actaully proxy all calls via REST
[PLAT-3909] making the remote test actaully proxy all calls via REST
Merge branch 'develop' of github.com:OpenGamma/OG-Platform into develop