changes
Merge branch 'master' of https://github.com/miryn/EscapeHunt

Conflicts:
	androidsrc/src/escape/hunt/rest/PlayerRole.java

Signed-off-by: premek <premekcech@seznam.cz>