修改log
修改目录结构
Merge remote-tracking branch 'origin/master'

Conflicts:
	seiya/seiya/helpers/menus.py
	seiya/seiya/templates/layout/sidebar.html
	seiya/seiya/views/frontend.py
修改目录结构