Merge branch 'master' of /Users/alperc/Projects/phi-cluster-core with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
simple taskexecutor
xml configuration