setting.py changed
main logo css fix
Merge branch 'develop'