update
Merge branch 'master' of https://github.com/7demo/yousiIpad

Conflicts:
	lib/js/canvas.js