Map to Json convertion
some git conflict
Merge branch 'master' of https://github.com/devosc00/server_side_bomb_clone

Conflicts:
	app/models/Server.scala