Update for use of SASS
Bootstrap the page
Merge remote-tracking branch 'origin/angular' into angular