Merge branch 'dimensionMembers'

Conflicts:
	SecureDWApp/SecureDWExtension/src/dke/extension/data/dbConnection/dbManager.java
	SecureDWApp/SecureDWExtension/src/dke/extension/data/dbConnection/dbManagerImpl.java
	SecureDWApp/SecureDWExtension/src/dke/extension/data/dimension/DataDictionary.java
	SecureDWApp/SecureDWExtension/src/dke/extension/logic/ControllerImpl.java
	SecureDWApp/SecureDWExtension/src/dke/extension/logic/dimensionManagement/ManageDimension.java
	SecureDWApp/SecureDWExtension/src/dke/extension/logic/dimensionManagement/ManageDimensionImpl.java
file name changes
Merge branch 'Patrick'

Conflicts:
	SecureDWApp/SecureDWExtension/src/dke/extension/data/dbConnection/DBManager.java
	SecureDWApp/SecureDWExtension/src/dke/extension/data/dbConnection/DBManagerImpl.java
	SecureDWApp/SecureDWExtension/src/dke/extension/data/dimension/DataDictionary.java
	SecureDWApp/SecureDWExtension/src/dke/extension/logic/dimensionManagement/ManageDimension.java
	SecureDWApp/SecureDWExtension/src/dke/extension/logic/dimensionManagement/ManageDimensionImpl.java
DBManager in ManageDB umbenannt um den namenskonflikt zu umgehen
file name changes
DBManager in ManageDB umbenannt um den namenskonflikt zu umgehen
Merge branch 'master' of https://github.com/FatTony123/SecureDWClient

Conflicts:
	SecureDWApp/SecureDWExtension/src/dke/extension/data/dbConnection/ManageDB.java
	SecureDWApp/SecureDWExtension/src/dke/extension/logic/dimensionManagement/ManageDimensionImpl.java