Merge pull request #14 from felixsoum/frontend-dev

Frontend dev
Fix revert of admin_controller.rb
Merge pull request #15 from felixsoum/backend

Integrate player from frontend and backend
Merge branch 'master' into frontend-dev