A lot has been done
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Group4/ChallengeBundle/Controller/PlayerController.php
	src/Group4/ChallengeBundle/Entity/Challenge.php
Routes added, Entities editted
Merge branch 'master' of https://github.com/nfqakademija/group4-studio