Minor changset.
Merge branch 'master' of https://github.com/gajdipajti/ice-storm

Conflicts:
	ice_dev.m~