V2 [WIP]
V2 release prep
Add 1.x and 2.x blocks to CHANGELOG
Update CHANGELOG
Merge branch 'feature/v2' into develop