slice
for zj
fix bugs
html renew
Merge branch 'cetc-zhangjing' of 192.168.5.102:ccf into cetc-zhangjing
html renew
super user only
Merge branch 'cetc-release-1.0' of 192.168.5.102:~/ccf into cete-cjx
html
 renew
Merge branch 'cetc-zhangjing' of 192.168.5.102:ccf into cetc-zhangjing
css renew
slice
css renew
Merge branch 'cetc-zhangjing' of 192.168.5.102:~/ccf into cete-cjx

Conflicts:
	monitor/views.py
Merge branch 'cetc-zhangjing' of 192.168.5.102:~/ccf into cete-cjx
html renew
Merge branch 'cetc-zhangjing' of 192.168.5.102:~/ccf into cete-cjx
css renew
Merge branch 'cetc-zhangjing' of 192.168.5.102:~/ccf into cete-cjx
html renew