Merge branch 'development' of https://github.com/StatsPro/StatsPro
Tidy the monog.py working on the unit test.
Merge branch 'master' of https://github.com/StatsPro/StatsPro

Conflicts:
	src/mongo.py