Changed to multiple generative gaussians
Merge branch 'master' into old

Conflicts:
	GMM_Estimator/src/GMM_Estimator.py
	GMM_Estimator/src/GMM_Estimator.pyc
	GMM_Estimator/src/__init__.py