active admin + design

reupload
Merge remote-tracking branch 'origin/master'