Signed-off-by: zhaolin <zzz891230@gmail.com>
update 2013-11-28 zhaolin
Modified 2013-11-28 zhaolin
Merge branch 'master' of https://github.com/zhaolin1230/QRCodeTag

Conflicts:
	.gitignore

Initial on github