added feature_list
added FeatureB
Added feature A
fixed bugs
Merge branch 'release'