changed directory name to upper case
changed unittest directory name to upper case
Merge branch 'feature_20140313' into develop