Updated feature to 2.0 branch
Updated feature to 2.0 branch
Removed old (Conflicted) features