cleaned up some comments
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Data_Output/Analysis.py
	Data_Output/Statistics.py