test.
Merge branch 'master' of https://github.com/bazocc4/zpanel

Conflicts:
	app/tmp/logs/debug.log
Merge branch 'master' of https://github.com/bazocc4/zpanel
del logs.
Merge branch 'master' of https://github.com/bazocc4/zpanel

Conflicts:
	app/tmp/logs/debug.log
	app/tmp/logs/error.log
empty logs.
Merge branch 'master' of https://github.com/bazocc4/zpanel