changed doccomment at files
Merge branch 'feature_20140310' into develop