Revisioning js/css.
Merge branch 'develop'