ShinyCMS Upstream Merge & Favicon Fix