sanitized colors for deploy
Fix tests that broke due to restructure of views
Merge branch 'develop' into proposals-sankey-#72