Changed JCombobox for java 1.6 compability
Merge branch 'master' into gui
Merge remote-tracking branch 'remotes/origin/master' into gui