css renew
vm state
Merge branch 'master' of 192.168.5.102:~/ccf
html renew
Merge branch 'master' of 192.168.5.102:ccf
html renew
fix customize category
Merge branch 'master' of 192.168.5.102:ccf
js renew
Merge branch 'master' of 192.168.5.102:ccf
revert database settings
Merge branch 'master' of 192.168.5.102:ccf
html,less,css renew
Merge branch 'master' of 192.168.5.102:ccf
html renew
add topology to home page
Merge branch 'master' of 192.168.5.102:ccf
add direct parameter
home slice topology
Merge branch 'master' of 192.168.5.102:~/ccf

Conflicts:
	ccf/settings.py
	ccf/templates/homepage.html