Merge tag 'v2.1' into develop

New charts and lots of browser testing
cleaning up validation errors
tweaking more validation
Merge branch 'release/v1.2.1'