css
Merge branch 'master' of https://github.com/gaoxiao/bole

Conflicts:
	info/templates/info/list.html
tete
modify page