Fix importpath for bower components
Merge branch 'master' into 4
Update markup.