Made changes to the GridEditor.cs that didn't merge. Made inheritance come from the EditorBase rather than just editor

Signed-off-by: Neal Valiant <neavalia@uat.edu>
Merge https://github.com/n3amarvalia/Game into n3amarvalia-master

Conflicts:
	Assets/Scripts/Editor/GridEditor.cs
	Assets/Scripts/Editor/GridEditor.cs.meta

Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>