static
Merge branch 'master' of https://github.com/linchg/wangpan

Conflicts:
	application/config/autoload.php