Merge branch 'palloi'
Compile js and css files after merge