data structure and collector code rewrite - nishant
Merge remote-tracking branch 'origin/master'

Conflicts:
	QueryFunctions.py