preped with angular
Merge remote-tracking branch 'origin/angular' into angular

Conflicts:
	views/layout.ejs