html renew
html renew
slice
Merge branch 'master' of 192.168.5.102:~/ccf

Conflicts:
	slice/slice_api.py
Merge branch 'feature-ui' of 192.168.5.102:ccf
Merge branch 'master' of 192.168.5.102:ccf
modify vm_list.html
Merge branch 'master' of 192.168.5.102:ccf
css renew
modify vmform
Merge branch 'feature-ui' of 192.168.5.102:ccf
slice
Merge branch 'master' of 192.168.5.102:~/ccf
slice
modify vmform
revert theme.js
Merge branch 'master' of 192.168.5.102:~/ccf
Merge branch 'master' of 192.168.5.102:ccf
truncate cpu
Merge branch 'master' of 192.168.5.102:~/ccf