Cake changes to default layout

Less reliant on domain specific paths, and more towards cake specific
paths.
Merge remote-tracking branch 'origin/master' into development
Fix reference to app's style.css file