no message
Merge branch 'master' of https://github.com/ToraWu/QRComposeEffects
1.更新zbar 静态库
2.增加二维码区域绘制
3.增加二维码背景颜色设置
Merge branch 'master' of https://github.com/ToraWu/QRComposeEffects

Conflicts:
	QRComposeEffects/TRViewController.m