Merge branch 'unstable-merge' into unstable

.gitignore

Makefile.in

configure.ac

data-test/simple-var-bool-false.json

data-test/simple-var-bool-true.json

data-test/simple-var-int-neg.json

data-test/simple-var-int-pos.json

data-test/simple-var-int-zero.json

data-test/simple-var-real-neg.json

data-test/simple-var-real-pos.json

data-test/simple-var-real-wo-dec.json

data-test/simple-var-real-zero.json

src/Makefile.in

src/_tags.in

src/lustreSpec.ml

src/tools/stateflow/common/basetypes.ml

src/tools/stateflow/common/datatype.ml

src/tools/stateflow/json-parser/json_parser.ml

src/tools/stateflow/json-parser/main_parse_json_file.ml

...tools/stateflow/json-parser/test_json_parser_variables.ml