removed duplicated datasource reload for derived datachoice
Merge remote-tracking branch 'origin/master'
making use of Java data structures
jindent