the whole version
Merge branch 'master' of https://github.com/maxinfang/Cpath

Conflicts:
	maxv2.js
	shape.js