#1035 : in colour chooser window drop down list changed to buttons
merge fixed in game client controller
Merge branch 'master' of https://github.com/mkdskd/UNO