Merge pull request #156 from greboid/newserverdialog

Unit test EventTriggeringFocusListener
Lambdas.
Minor tidying.
Merge pull request #157 from csmith/master

Lambdas.
Remove unused variable.