changed Enum class file
changed Enum class unittest file
Merge branch 'feature_20140320' into develop