Updated MagicCarpet and Webadmin

Please see commit descriptions.