xstream on android has troubles loading into a treeset...workaround for now...
Merge remote-tracking branch 'origin/develop' into develop