test git

20140902 qt protobuffer zip utf82gbk

20140902 qt protobuffer zip
utf82gbk
test conmit

test conmit
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.cpp