Merge branch 'release/2' into develop
Bumped to version 2.1
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Added stuff
Merge branch 'release/2.1'