Merge pull request #86 from jjmerino/develop

builds are passing for PRs again :)
Fix assets compilation