Fixing issues with the asset pipeline

Signed-off-by: Yuri Tománek <yuri@tomanek.com.au>
Merge branch 'master' of github.com:Gluttonberg/core