Merge branch 'core' into v2.1

Author: nmacedo

org.alloytools.alloy.dist/bnd.bnd

@@ -28,4 +28,5 @@ Main-Class: edu.mit.csail.sdg.alloy4whole.Alloy
 	@${repo;org.sat4j.maxsat}, \
 	@${repo;org.sat4j.pb}, \
 	@${repo;org.apache.commons.cli}, \
+	@${repo;slf4j.simple} ,\
 	LICENSES