config
Merge branch 'bugfix-v9.0.4' of 192.168.5.102:ccf into bugfix-v9.0.4

Conflicts:
	etc/config.py
config
config
config
fix bugs
Merge branch 'bugfix-v9.0.4' of 192.168.5.102:ccf into bugfix-v9.0.4
vpn
del vpn ip
Merge branch 'cetc-beta' of 192.168.5.102:ccf into feature-chengwen01
monitor
fix bugs
change settings
html renew
css renew
monitor
fix bugs
Merge branch 'feature-chengwen01' of 192.168.5.102:ccf into feature-chengwen01

Conflicts:
	monitor/templates/monitor_switch.html
project filter
missing js