Merge branch 'master' of github.com:mariofischer/cwcrop

Conflicts:
	Demo/index.html
	Source/ysr-crop.js
	package.yml
Resolve conflicts