database
slice detail 页面添加【添加虚拟机】入口
Merge branch 'master' of 192.168.5.102:ccf
去掉冲突的部分
remove checkbox in slice creation
Merge branch 'master' of 192.168.5.102:ccf
remove target
slice list Merge branch 'master' of 192.168.5.102:~/ccf

Conflicts:
	ccf/settings.py
setting
setting
slice list
html renew
html renew
slice
Merge branch 'master' of 192.168.5.102:~/ccf
修改servername获取不到的问题