Merge branch 'decision_points' of https://github.com/adisandro/MMINT into decision_points

Conflicts:
	Core/edu.toronto.cs.se.mmint/META-INF/MANIFEST.MF
Merge branch 'decision_points' of https://github.com/adisandro/MMINT into decision_points
mu-mmint: Adding labels for alternatives
decision_points: Add proof of concept for a cross-diagram mavo menu
Merge branch 'master' of https://github.com/adisandro/MMINT into decision_points
Merge branch 'decision_points' of https://github.com/adisandro/MMINT into decision_points
decision_points: Add decisions and alternatives to the z3 encoding

 * Add functions for alternatives
 * Add constraint for elements in an alternative
 * Add decision constraints
 * Fix mayOnly not overridable through input properties
 * Fix model types inheriting from the wrong mavo uri
Merge branch 'decision_points' of https://github.com/adisandro/MMINT into decision_points

Conflicts:
	External/Z3/edu.toronto.cs.se.modelepedia.z3/src/edu/toronto/cs/se/modelepedia/z3/mavo/EcoreMAVOToSMTLIBUtils_M2T.mtl
Merge branch 'master' into decision_points
decision_points: Fix wrong usage of xors in alternative encoding
Merge branch 'decision_points' (checkpoint mavo alternatives encoding)
mavo: Fix function name referring to old formulaIds
mu-mmint: removing and adding to alternatives from menu
Merge branch 'master' of https://github.com/adisandro/MMINT into decision_points

Conflicts:
	External/Z3/edu.toronto.cs.se.modelepedia.z3/src/edu/toronto/cs/se/modelepedia/z3/mavo/EcoreMAVOToSMTLIBUtils_M2T.mtl
rej14: Add smart grid model
rej14: Add explicit formula variable for double edges in the model
rej14: Fix duplicate goal name
rej14: Add decomposition propagation rule to goals
rej14: Update uncertain model
rej14: Create initial certain model copied from uncertain