EchoRunner is no longer singleton
EchoRunner is no longer singleton
EngineFactory no longer singleton
smal change
smal change
merge reverted and small doc changes
merge reverted and small doc changes
Canceling options
Merge branch 'v0.3' into kodkod_backend

Conflicts:
	examples/pt.uminho.haslab.echo.examples/metamodels/hsm2nhsm/HSM.ecore
	examples/pt.uminho.haslab.echo.examples/metamodels/multiplicities/A_base.ecore
	examples/pt.uminho.haslab.echo.examples/metamodels/multiplicities/A_extended.ecore
	examples/pt.uminho.haslab.echo.examples/metamodels/multiplicities/B_base.ecore
	examples/pt.uminho.haslab.echo.examples/metamodels/multiplicities/B_extended.ecore
	examples/pt.uminho.haslab.echo.examples/models/uml2rdbms_keys/UML_Company.xmi
	examples/pt.uminho.haslab.echo.examples/transformations/qvt/uml2rdbms_simple/uml2rdbms_simple.qvtr
	plugins/pt.uminho.haslab.echo.plugin/src/pt/uminho/haslab/echo/plugin/PluginMonitor.java
	plugins/pt.uminho.haslab.echo.plugin/src/pt/uminho/haslab/echo/plugin/ResourceManager.java
	plugins/pt.uminho.haslab.echo.plugin/src/pt/uminho/haslab/echo/plugin/listeners/ResourceChangeListener.java
	plugins/pt.uminho.haslab.echo.plugin/src/pt/uminho/haslab/echo/plugin/markers/EchoInterQuickFix.java
	plugins/pt.uminho.haslab.echo.plugin/src/pt/uminho/haslab/echo/plugin/markers/EchoIntraQuickFix.java
	plugins/pt.uminho.haslab.echo.plugin/src/pt/uminho/haslab/echo/plugin/properties/ProjectPropertiesManager.java
	plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/EchoRunner.java
	plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/EngineRunner.java
	plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/alloy/AlloyRunner.java
Canceling options
Revert
fixed corrupt merge