js/css switching

js/css switching
Merge branch 'master' into HEAD