broke out data load tool.. slightly
Merge branch 'master' into UI_30