bored of conflicts now
Merge branch '0-6-stable' of https://github.com/madebymade/active_admin into 0-6-stable