Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	MvcSASE/MvcSASE.v12.suo
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	MvcSASE/MvcSASE.v12.suo
	MvcSASE/MvcSASE/obj/Debug/MvcSASE.csprojResolveAssemblyReference.cache
merged in gitignore