Some bundles merged
Files missing from old commit
Merged remaining bundles
Completed merge and fixed hac and configurator project set-up to properly load xml configuration files
Fixed launch configurations and EmptyConfig categories list
modified launch configuration
Merge branch 'master' of github.com:ismb/jemma into merge_demoamsterdam
restored launch configuration
Merge branch 'master' of github.com:ismb/jemma into merge_demoamsterdam
Minor changes on source code for future inclusion of new clusters
Merge branch 'master' of github.com:ismb/jemma into merge_demoamsterdam