Add Player model
Merge with master and fix conflicts