Fix some Findbugs issues
Small refactoring
Fix NPE in Clocks.updateOrder()
Update city data.
Prepare release 1.5.8