Esolved conflicts

...ti_view_classifiers/monoview_classifiers/random_forest.py

...m/mono_multi_view_classifiers/monoview_classifiers/scm.py

...multi_view_classifiers/monoview_classifiers/scm_pregen.py

...m/mono_multi_view_classifiers/monoview_classifiers/sgd.py

...multi_view_classifiers/monoview_classifiers/svm_linear.py

...o_multi_view_classifiers/monoview_classifiers/svm_poly.py

...no_multi_view_classifiers/monoview_classifiers/svm_rbf.py

.../mono_multi_view_classifiers/multiview/analyze_results.py

...m/mono_multi_view_classifiers/multiview/exec_multiview.py

.../mono_multi_view_classifiers/multiview/multiview_utils.py

...ers/multiview_classifiers/weighted_linear_early_fusion.py

multiview_platform/tests/__init__.py

multiview_platform/tests/test_ExecClassif.py

...platform/tests/test_mono_view/test_ExecClassifMonoView.py

...iview_platform/tests/test_mono_view/test_MonoviewUtils.py

...tiview_classifiers/test_additions/test_diversity_utils.py

...ests/test_multiview_classifiers/test_difficulty_fusion.py

.../tests/test_multiview_classifiers/test_disagree_fusion.py

...ts/test_multiview_classifiers/test_double_fault_fusion.py

...m/tests/test_multiview_classifiers/test_entropy_fusion.py