Feature/fix migrations and grunt