Commit to fix merge issues
Merge branch 'master' of https://github.com/IngLnx/SpreadsheetScript

Conflicts:
	csv_config.pyc
	editlog.txt