WIP Final product

david.kuchlerrequested to merge
jerome.chetelat/agario:develop into master

Merging our work, expect a few conflicts and bugs

Merge request reports