Fixes to UserListPanel that make the application not compile on Java 6
Merge branch 'martijn' into wander-web
Revert. Apparently generic JCombo's are JDK7 only.

This reverts commit 81fa28fce56abf107e50d8cdc2b361054bd46704.