Add initial commit of angular editor for mcp-2.0
Smnall changes to layout in mcp and mcp-1.4
Merge remote-tracking branch 'upstream/master'