add "type" to Area model
ad bg image
update nav bar
add brand image
finished qiri v2
Merge branch 'yanxi'

Conflicts:
	views/include/header.ejs