added ActiveAdmin
active admin bug fix with routes
Merge branch 'staging'