New N.J. medical marijuana bill calls for more dispensaries, edibles