Merge "Added editor modes"