Permit options override
margin hack
Merge remote-tracking branch 'pierre/master'

Conflicts:
	lib/qrcode-draw.js
merged pierre