modify static_media path
modify favicon.ico
html renew
Merge branch 'master' of 192.168.5.102:ccf
img renew
slice
footer html renew
js renew
controller ip
fix bugs
html renew
Merge branch 'master' of 192.168.5.102:ccf

Conflicts:
	project/templates/project/_project.html
Merge branch 'master' of 192.168.5.102:ccf
setting
Merge branch 'master' of 192.168.5.102:~/ccf
renew html
Merge branch 'master' of 192.168.5.102:ccf