minor refactor
++ version
Merge branch 'finalfantasy' of https://github.com/Solid-Interactive/grasshopper-admin into finalfantasy