changed Common/String class
changed Common/String class unit test file
Merge branch 'feature_20140602' into develop