modify feature.xml
remove unused plugins
Merge branch 'master' of https://github.com/aradouan/ReqCycle

Conflicts:
	features/org.eclipse.reqcycle.feature/feature.xml
	features/org.eclipse.ziggurat.feature/feature.xml
	plugins/org.eclipse.reqcycle.repository.connector.ui/src/org/eclipse/reqcycle/repository/connector/ui/wizard/AbstractSettingPage2.java
	plugins/org.eclipse.reqcycle.traceability.cache.jena/.classpath
	plugins/org.eclipse.reqcycle.traceability.cache.jena/.project
	plugins/org.eclipse.ziggurat.configuration/.classpath
	plugins/org.eclipse.ziggurat.configuration/.gitignore
	plugins/org.eclipse.ziggurat.configuration/.project
	plugins/org.eclipse.ziggurat.configuration/.settings/org.eclipse.jdt.core.prefs
	plugins/org.eclipse.ziggurat.configuration/META-INF/MANIFEST.MF
	plugins/org.eclipse.ziggurat.configuration/build.properties
	plugins/org.eclipse.ziggurat.configuration/epl-v10.html
	plugins/org.eclipse.ziggurat.configuration/plugin.xml
	plugins/org.eclipse.ziggurat.configuration/src/org/eclipse/ziggurat/configuration/Activator.java
	plugins/org.eclipse.ziggurat.configuration/src/org/eclipse/ziggurat/configuration/IConfigurationManager.java
	plugins/org.eclipse.ziggurat.configuration/src/org/eclipse/ziggurat/configuration/impl/ConfigurationManagerImpl.java
	plugins/org.eclipse.ziggurat.configuration/src/org/eclipse/ziggurat/configuration/impl/EMFConfResourceFactory.java
	plugins/org.eclipse.ziggurat.configuration/src/org/eclipse/ziggurat/configuration/impl/RestrictedResourceSet.java
	plugins/org.eclipse.ziggurat.inject/.classpath
	plugins/org.eclipse.ziggurat.inject/.gitignore
	plugins/org.eclipse.ziggurat.inject/.project
	plugins/org.eclipse.ziggurat.inject/.settings/org.eclipse.jdt.core.prefs
	plugins/org.eclipse.ziggurat.inject/META-INF/MANIFEST.MF
	plugins/org.eclipse.ziggurat.inject/build.properties
	plugins/org.eclipse.ziggurat.inject/epl-v10.html
	plugins/org.eclipse.ziggurat.inject/plugin.xml
	plugins/org.eclipse.ziggurat.inject/schema/binding.exsd
	plugins/org.eclipse.ziggurat.inject/src/org/eclipse/ziggurat/inject/BindingManager.java
	plugins/org.eclipse.ziggurat.inject/src/org/eclipse/ziggurat/inject/ZigguratInject.java
	plugins/org.eclipse.ziggurat.modelnature/.classpath
	plugins/org.eclipse.ziggurat.modelnature/.gitignore
	plugins/org.eclipse.ziggurat.modelnature/.project
	plugins/org.eclipse.ziggurat.modelnature/.settings/org.eclipse.jdt.core.prefs
	plugins/org.eclipse.ziggurat.modelnature/META-INF/MANIFEST.MF
	plugins/org.eclipse.ziggurat.modelnature/build.properties
	plugins/org.eclipse.ziggurat.modelnature/epl-v10.html
	plugins/org.eclipse.ziggurat.modelnature/plugin.xml
	plugins/org.eclipse.ziggurat.modelnature/schema/modelnature.exsd
	plugins/org.eclipse.ziggurat.modelnature/src/org/eclipse/ziggurat/modelnature/ModelNature.java
	plugins/org.eclipse.ziggurat.modelnature/src/org/eclipse/ziggurat/modelnature/ModelNaturePlugin.java
	plugins/org.eclipse.ziggurat.modelnature/src/org/eclipse/ziggurat/modelnature/ModelNatureService.java
	plugins/org.eclipse.ziggurat.modelnature/src/org/eclipse/ziggurat/modelnature/exceptions/NatureNotFoundException.java
	plugins/org.eclipse.ziggurat.modelnature/src/org/eclipse/ziggurat/modelnature/internal/DynamicNatureServiceImpl.java
	plugins/org.eclipse.ziggurat.modelnature/src/org/eclipse/ziggurat/modelnature/internal/SerializedNatureServiceImpl.java
resolve conflict
Merge branch 'master' of https://github.com/aradouan/ReqCycle

Conflicts:
	plugins/org.eclipse.ziggurat.configuration/epl-v10.html
	plugins/org.eclipse.ziggurat.inject/.project
use setting wizard from the connector
Merge branch 'master' of https://github.com/aradouan/ReqCycle into refactoringRMF

Conflicts:
	plugins/org.eclipse.reqcycle.repository.connector.ui/src/org/eclipse/reqcycle/repository/connector/ui/wizard/NewRequirementSourceWizard.java
Merge branch 'refactoring-connector' of https://github.com/aradouan/ReqCycle into refactoringRMF

Conflicts:
	plugins/org.eclipse.reqcycle.repository.connector.rmf/plugin.xml
	plugins/org.eclipse.reqcycle.repository.connector.rmf/src/org/eclipse/reqcycle/repository/connector/rmf/RMFConnectorUi.java
	plugins/org.eclipse.reqcycle.repository.connector.ui/src/org/eclipse/reqcycle/repository/connector/ui/IConnectorUi.java
	plugins/org.eclipse.reqcycle.repository.connector.ui/src/org/eclipse/reqcycle/repository/connector/ui/impl/ConnectorManagerUiImpl.java
	plugins/org.eclipse.reqcycle.repository.connector.ui/src/org/eclipse/reqcycle/repository/connector/ui/wizard/IRequirementSourceSettingPage.java
	plugins/org.eclipse.reqcycle.repository.connector.ui/src/org/eclipse/reqcycle/repository/connector/ui/wizard/NewRequirementSourceWizard.java
	plugins/org.eclipse.reqcycle.repository.ui/src/org/eclipse/reqcycle/repository/ui/actions/AddRequirementSourceAction.java
rmf refactoring
Merge branch 'refactoring-connector' of https://github.com/aradouan/ReqCycle into refactoringRMF

Conflicts:
	plugins/org.eclipse.reqcycle.repository.connector.ui/src/org/eclipse/reqcycle/repository/connector/ui/wizard/pages/AbstractSettingPage2.java
	plugins/org.eclipse.reqcycle.repository.connector/src/org/eclipse/reqcycle/repository/connector/impl/ConnectorManager.java
	plugins/org.eclipse.reqcycle.repository.ui/src/org/eclipse/reqcycle/repository/ui/actions/EditMappingAction.java
refactoring rmf, use the new IConnector for requirement source creation
get the active shell instead of creating a new one