Other changes
Various changes
Merge branch 'master' of https://github.com/robsonfr/cocotla

Conflicts:
	casconv.py