project manage page
html css js renew
Merge branch 'master' of 192.168.5.102:ccf
invite
Merge branch 'master' of 192.168.5.102:ccf
invite search
button color renew
html renew
create page restylish
Merge branch 'master' of 192.168.5.102:ccf

Conflicts:
	project/templates/project/create.html
customize category
html renew
html renew
Merge branch 'master' of 192.168.5.102:ccf
html renew
提交虚拟机操作
Merge branch 'master' of 192.168.5.102:ccf

Conflicts:
	slice/templates/slice/slice_detail.html