Merge branch 'release/v2.2.0'
Merge tag 'v2.2.0' into develop

Twitter section readded, portfolio gone, lots of code updates