Merge branch 'master' of https://github.com/canimus/rqrcode_png

Conflicts:
	lib/rqrcode_png/qrcode_extensions.rb