changed yaml file load failed process
Merge branch 'feature_20140304' into develop