commit 00139
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	2014_11_01_09_42_15_D7有关二维码的实验/01001.fr3
	2014_11_01_09_42_15_D7有关二维码的实验/Unit1.pas