zyk
Merge branch 'master' of https://github.com/feiruan/sitem

Conflicts:
	App/Lib/Action/Admin/MeetingAction.class.php