更新授权 手风琴Facebook
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/layouts/left.jsp