CN Tower test
Merge branch 'master' of https://github.com/zoltan-dulac/html5ImageConverter

Conflicts:
	bin/functions.sh
	bin/html5ImageConverter.sh
	examples/cn-tower/cn-tower-1024.jp2
	examples/cn-tower/cn-tower-1024.jpg
	examples/cn-tower/cn-tower-1024.jxr
	examples/cn-tower/cn-tower-1024.webp
	examples/cn-tower/cn-tower-320.jp2
	examples/cn-tower/cn-tower-320.jpg
	examples/cn-tower/cn-tower-320.jxr
	examples/cn-tower/cn-tower-320.webp
	examples/cn-tower/cn-tower-600.jp2
	examples/cn-tower/cn-tower-600.jpg
	examples/cn-tower/cn-tower-600.jxr
	examples/cn-tower/cn-tower-600.webp
Putting back cn-tower images.