Modify user model
Merge branch 'TH-1' into dev1.0
Modifu users model
TH-6 | List of the prev battles (logs)
fix conflict on merge