fan
Merge branch 'master' of https://github.com/dlwebs/weixinprinter

# By zhaobin
# Via zhaobin
* 'master' of https://github.com/dlwebs/weixinprinter:
  add
Merge branch 'master' of https://github.com/dlwebs/weixinprinter

# By zhaobin
# Via zhaobin
* 'master' of https://github.com/dlwebs/weixinprinter:
  add
fan
Merge branch 'master' of https://github.com/dlwebs/weixinprinter

# By ivan820819
# Via ivan820819
* 'master' of https://github.com/dlwebs/weixinprinter:
  zb

Conflicts:
	Application/Admin/Model/PrintertplModel.class.php
	Application/Admin/View/Printer/modprinter.html