Upload Images
Update
update
Modify Project Description.
Modify Project Description.
Remove some image files
Modify header and category template, Remove cache images.
Merge branch 'master' of https://github.com/bigv220/jsis

Conflicts:
	catalog/controller/common/header.php
	catalog/language/chinese/checkout/checkout.php
	catalog/view/theme/elegantcart/template/common/footer.tpl
	catalog/view/theme/elegantcart/template/common/header.tpl
	export/admin/controller/common/header.php
	export/admin/language/english/common/header.php
	image/cache/data/banner1-100x100.png
	image/cache/data/banner1-960x400.png
	image/cache/data/banner2-100x100.png
	image/cache/data/banner2-960x400.png
	image/cache/data/banner3-100x100.png
	image/cache/data/banner3-960x400.png
	image/cache/data/sm_banner1-310x170.png
	image/cache/data/sm_banner2-310x170.png
	system/PHPExcel/Classes/PHPExcel/CachedObjectStorage/CacheBase.php
	system/PHPExcel/Classes/PHPExcel/CachedObjectStorage/DiscISAM.php
	system/PHPExcel/Classes/PHPExcel/CachedObjectStorage/Igbinary.php
	system/PHPExcel/Classes/PHPExcel/CachedObjectStorage/Memcache.php
	system/PHPExcel/Classes/PHPExcel/CachedObjectStorage/Memory.php
	system/PHPExcel/Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php
	system/PHPExcel/Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php
	system/PHPExcel/Classes/PHPExcel/CachedObjectStorage/PHPTemp.php
	system/PHPExcel/Classes/PHPExcel/CachedObjectStorage/SQLite.php
	system/PHPExcel/Classes/PHPExcel/CachedObjectStorage/SQLite3.php
	system/PHPExcel/Classes/PHPExcel/CachedObjectStorage/Wincache.php
	system/PHPExcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
	system/PHPExcel/Classes/PHPExcel/Chart/Renderer/jpgraph.php
	system/PHPExcel/Classes/PHPExcel/Reader/Excel2007.php
	system/PHPExcel/Classes/PHPExcel/Reader/Excel5.php
	system/PHPExcel/Classes/PHPExcel/Shared/OLE/PPS/Root.php
	system/PHPExcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
	system/PHPExcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
	system/PHPExcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
	system/PHPExcel/Classes/PHPExcel/locale/pt/br/functions
	system/PHPExcel/Classes/PHPExcel/locale/pt/functions
	system/PHPExcel/Classes/PHPExcel/locale/sv/functions
	system/logs/error.txt