scaffolding OData Controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	2015 - dotnetpro - Optimale Web-Umgebung mit AngularJS und ASP.NET/Artikel2/AngularDemo/AngularDemo/AngularDemo.csproj
screenshot scaffolding