Merge branch 'master' of https://github.com/mono/monodevelop

Conflicts:
	main/Main.sln
	main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.addin.xml
	main/src/core/Mono.Texteditor/SyntaxModes/HtmlSyntaxMode.xml
	main/src/core/Mono.Texteditor/SyntaxModes/RazorSyntaxMode.xml
Added JavaScript project to sln after merge.
Added JavaScript project to sln after merge.