Merge branch 'master' of 192.168.5.102:ccf into feature-ui
Merge branch 'bugfix-7.2.1' of 192.168.5.102:ccf into feature-ui
add cloud node
initial south schema
topology
add topology on vm creation page
Merge branch 'master' of 192.168.5.102:~/ccf into feature-seven

Conflicts:
	slice/templates/slice/slice_detail.html
Merge branch 'feature-seven' of 192.168.5.102:ccf into feature-vm
modify topology on vm creation page
breadcrumb
remove port tip on topology
Merge branch 'feature-tzf-8.0' of 192.168.5.102:ccf into feature-vm
Merge branch 'feature-tzf-8.0' of 192.168.5.102:~/ccf into feature-seven
html renew
Merge branch 'feature-tzf-8.0' of 192.168.5.102:ccf into feature-ui
delete port fields
fix bug
add monitor link for node
add ip range info
user registration strategy change