Merge branch 'develop' of github.com:fishlamp/FishLamp into develop
Merge branch 'develop' of github.com:fishlamp/FishLamp into develop
resolved some long standing issues with xml parser