removed tab character in files
Merge branch 'feature_20140311' into develop