mu-mmint: changed the way coloring is done to grey out irrelevant parts
Merge branch 'master' of https://github.com/adisandro/MMINT
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
Merge branch 'master' of https://github.com/adisandro/MMINT
mu-mmint: clean up highlighting
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
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
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
mu-mmint: adding decision tree view
Merge branch 'master' of https://github.com/adisandro/MMINT into decision_points

Conflicts:
	Core/edu.toronto.cs.se.mmint.diagram/src/edu/toronto/cs/se/mmint/mid/diagram/contextmenu/MAVOAddToAlternative.java
mu-mmint: MAVODecisionTree menu for adding and removing elements
Merge branch 'master' of https://github.com/adisandro/MMINT into decision_points
pull request changes
Merge branch 'decision_points' of https://github.com/naamabd14/MMINT into naama
Merge Naama's decision_point pull request