changed setup and included grappelli > 2.5