sites framework
Merge branch 'master' of github.com:pan-mroku/SIG

Conflicts:
	article/templates/article_list.html
	sig/templates/menu.html
Merge branch 'master' of github.com:pan-mroku/SIG

Conflicts:
	sig/templates/menu.html