small changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ccdb_read_spreadsheet.py
	bin/helper_functions.py
	bin/helper_functions.pyc