BUGFIX: remove row from batch table when deleting item from batch
Extra HTTP headers on calendar feed
Merge remote-tracking branch 'origin/fannieDevelop' into fannieDevelop
Remove extra copy of CalendarFeed.php. Fix merge bug with duplicated
class properties