30png
Merge branch 'master' of github.com:tumao/Smar_xd

Conflicts:
	front/upload/company_logo/30.png
fix bug