Update 2132, 3016, 8755. Fix 2221,2225,7124
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/theme/xpanel/footer.php