changed config file and added config file
Merge branch 'feature_20140303' into develop