Merge branch 'master' of github.com:nikiroo/fanfix-swing