Resolving some warnings
minor conflict fixing
Minor warning resolving
menor for testing
Merge branch 'master' into cancelling
Packages refactored and some AlloyEchoTranslator method visibility changed from public to pacakge protected to hide alloy types.
Starting work on the refactoring of OCL, ATL and QVT translation.
merging with master
Fixed Consistency
Changed Kodkod package architecture
import fixing
Working on Metamodels in kodkod
small changes
Some work on Instances
idea files ignored
protecting.
.gitinore
Merge branch 'master' into cancelling

Conflicts:
	plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/EchoRunner.java
	plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/consistency/qvt/QVTCondition.java
	plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/transform/alloy/XMI2Alloy.java
Merge branch 'master' into cancelling

Conflicts:
	plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/EchoRunner.java
	plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/consistency/qvt/QVTCondition.java
	plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/transform/alloy/XMI2Alloy.java
Resolving Conflicts