Move all JS and CSS includes into base template

Change-Id: If916ad1cdae024a98f44a7c02b0065517858956c
Merge "Move all JS and CSS includes into base template"