Configuration & Templates
Merge remote-tracking branch 'origin/Angular' into Angular

Conflicts:
	RTS/Migrations/Configuration.cs