menu test
Merge branch 'menu' into dev

Conflicts:
	project/apps/bbs/urls.py
	project/apps/bbs/views.py