changed method name to concat from getEnumFullName
Merge branch 'feature_20140321' into develop