Merge branch 'dev/board' into feat/layout
Implement new registration page as design.
Merge branch 'dev/board' into feat/layout
Create categories with model information
Change the Maximum total width of posters in one line
Make css file for view page and delete unnecessary black region
Change to arrange the poster's group and margins
Update css to fit cross browsers.
Add title counter javascript function.
Merge remote-tracking branch 'origin/feat/view' into dev/board
Change poster's height to 180px
implemented mouseover effect by editing view.css and view_page.html
Merge branch 'dev/board' into feat/club_page
club searching and article filtering
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
Merge two view.css files for main page