Merge branch 'dev/board' into feat/layout
implement basic modal view
modalview size 조정
modalview static html 작성
Merge branch 'dev/board' into feat/layout
Create categories with model information
Update css to fit cross browsers.
Add title counter javascript function.
Merge remote-tracking branch 'origin/feat/view' into dev/board
setting basic ajax
modalview ajax data 전달
Merge branch 'dev/board' into feat/club_page
club searching and article filtering
modalview main poster 실시간 반영
Merge branch 'feat/article' into dev/board

Conflicts:
	zabo/apps/board/views.py
	zabo/templates/board/view_page.html
little club_info css change
Merge branch 'feat/club_page' into dev/board
Merge branch 'feat/layout' into dev/board
Merge remote-tracking branch 'origin/dev/board' into feat/view

Conflicts:
	zabo/templates/board/view_page.html