Some wicked merge artifacts from previous merge in leafletCtrl.js AND drawing is fully working now (again)