Changes
Merge branch 'refs/heads/master' into MyBranch

Conflicts:
	src/connectDatabaseConnection.py
CalculateStats created
Merge branch 'refs/heads/MyBranch'