fix active-admin
Merge branch 'demo2' of github.com:StrataLabs/service_desk into demo2