working on final design review changes, make sure static site kept in sync including js changes made previously
Merge remote-tracking branch 'origin/develop' into develop