added active admin
added lines to admin panel
added users to admin
pulled from master