Toolbox 1.5 beta

upstream djangotoolbox 1.5 beta changes to merchantatlas 1.5 beta