Changes to add name and cards to the cardsMap instead of name and Id.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/GameCelebrities.java