added import time to ice.py, fixed windows line endings in goc.py
Merge remote-tracking branch 'origin/HEAD'

Conflicts:
	platforms/m3_ctl/programming/ice.py