added _MULTI to end of g2 slider to make matrix
Merge branch 'master' into dev
Merge branch 'dev'