Generated activeadmin
Merge master
Fixed Gemfile.lock conflicts
Updated activeadmin options
Added players and teams
Updated users
Merge branch 'active-admin'