button style changed and disabled on duel
Merge branch 'master' of https://github.com/a12tdt4240/grotrisk

Conflicts:
	Test Game/test-game-android/assets/data/json/map.default.json