use xadmin
use xadmin
Merge remote-tracking branch 'origin/master'

Conflicts:
	books/salt_ui.py
use xadmin