EM refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/include/em/naive_bayes_em.hpp
	core/src/em/core_em.cpp
	core/src/em/naive_bayes_em.cpp
	tests/core/em/test_naive.cpp
	tests/core/fltm/test_fltm.cpp
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/include/em/naive_bayes_em.hpp
	core/src/em/core_em.cpp
	core/src/em/naive_bayes_em.cpp
	tests/core/em/test_naive.cpp
	tests/core/fltm/test_fltm.cpp