fixed correct psr-2 coding rule
Merge branch 'feature_20140305' into develop