add flowspace for window 2008
slice delete slice add delete route
add vpn
Merge branch 'cetc-release-1.0' of 192.168.5.102:ccf into cetc-release-1.0
slice delete slice double submit
Merge branch 'cetc-release-1.0' of 192.168.5.102:~/ccf into cetc-release-1.0
slice slice communicate
Merge branch 'cetc-release-1.1' of 192.168.5.102:~/ccf into cetc-release-1.1
slice
slice topology
slice topology
image pagination
Merge branch 'cetc-release-1.1' of 192.168.5.102:ccf into cetc-release-1.1

Conflicts:
	slice/templates/slice/slice_detail.html
image & snapshot query
Merge branch 'cetc-release-1.0' into cetc-release-1.1-bak

Conflicts:
	project/models.py
	slice/models.py
	slice/slice_api.py
slice
list image
slice create vm list page
slice create vm
Merge branch 'cetc-release-1.1' of 192.168.5.102:ccf into cetc-release-1.1

Conflicts:
	plugins/images/views.py