Conflicts:
	src/Compilers/CSharp/Portable/CSharpResources.resx
	src/Compilers/CSharp/Portable/Compiler/MethodCompiler.cs
	src/Compilers/CSharp/Portable/Errors/MessageID.cs
	src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedEntryPointSymbol.cs