fixed punch
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/components/Punch.js
Merge remote-tracking branch 'origin/master'