Assets split into css and js checks. Needs optimising
Merge branch 'hotfix/v1.1.4'