Generated CSS JS
Fixed transition syntax
Merge branch 'dev'