GRAS-987 Progress Commit.
Merge branch 'galaga' of https://github.com/Solid-Interactive/grasshopper-admin into galaga