Prvni commit do vetve
Merge branch 'master' into Petr

Conflicts:
	activepartytime/src/main/java/com/app/activepartytime/core/game/tasks/TaskType.java
Karta + cas

Stopky presunuty na obrazovku s kartou, obrazovka jako scroll view
added settings

emty screen
Settings window
next commit
add file
rollback
merge branch TEST
Merge remote-tracking branch 'origin/Simo' into Petr

Conflicts:
	activepartytime/src/main/java/com/app/activepartytime/activities/GameMoveActivity.java
	activepartytime/src/main/java/com/app/activepartytime/activities/fragments/GameInfoFragment.java
	activepartytime/src/main/java/com/app/activepartytime/activities/fragments/GamePlaygroundFragment.java
change name of menu item (time to playground)
Settings small changes