v5.1.2.0
v5.1.2.0(vna_pim增加导出vna功能)
pim结果计算放到上传时进行，修改pim查询
v5.1.0.0
新增pim上传时判断结果
v5.1.0.0增加pim客户端上传计算结果
v5.1.3.0修正git提交错误。修改包装客户端对pim的校验（针对凤市修改）。
forget changes
Merge branch 'v5.1.4.0'

Conflicts:
	application/config/database.php
	application/controllers/advancedsearch.php
	application/controllers/login.php
	application/controllers/packing.php
	application/controllers/producttestcase.php
	application/controllers/qualitypass.php
	application/controllers/vna_pim.php
	application/libraries/PHPExcel/locale/cs/config
	application/libraries/PHPExcel/locale/cs/functions
	application/libraries/PHPExcel/locale/da/config
	application/libraries/PHPExcel/locale/da/functions
	application/libraries/PHPExcel/locale/de/config
	application/libraries/PHPExcel/locale/de/functions
	application/libraries/PHPExcel/locale/en/uk/config
	application/libraries/PHPExcel/locale/es/config
	application/libraries/PHPExcel/locale/es/functions
	application/libraries/PHPExcel/locale/fi/config
	application/libraries/PHPExcel/locale/fi/functions
	application/libraries/PHPExcel/locale/fr/config
	application/libraries/PHPExcel/locale/fr/functions
	application/libraries/PHPExcel/locale/hu/config
	application/libraries/PHPExcel/locale/hu/functions
	application/libraries/PHPExcel/locale/it/config
	application/libraries/PHPExcel/locale/it/functions
	application/libraries/PHPExcel/locale/nl/config
	application/libraries/PHPExcel/locale/nl/functions
	application/libraries/PHPExcel/locale/no/config
	application/libraries/PHPExcel/locale/no/functions
	application/libraries/PHPExcel/locale/pl/config
	application/libraries/PHPExcel/locale/pl/functions
	application/libraries/PHPExcel/locale/pt/br/config
	application/libraries/PHPExcel/locale/pt/config
	application/libraries/PHPExcel/locale/ru/config
	application/libraries/PHPExcel/locale/ru/functions
	application/libraries/PHPExcel/locale/sv/config
	application/libraries/PHPExcel/locale/tr/config
	application/libraries/PHPExcel/locale/tr/functions
	application/views/templates/advancedsearch.tpl
	application/views/templates/defaultPage.tpl
	application/views/templates/index.tpl
	application/views/templates/login1.tpl
	application/views/templates/packing.tpl
	application/views/templates/producttestcase.tpl
	application/views/templates/qualitypass.tpl
	application/views/templates/vna_pim.tpl
	application/views/templates/vna_pim_detail.tpl