repair autostation active_admin
Merge branch 'develop'