修復新增社團問題
Merge branch 'master' of github.com:gosick/ClubPlatform

Conflicts:
	layout/clubContent.php