styles and creation of gmafilters code with manually marked up filters
Merge branch 'develop' of https://github.com/appdevdesigns/opstool-gmaMatrix into develop

Conflicts:
	assets/opstools/GMAMatrix/controllers/GMAMatrix.js
	assets/opstools/GMAMatrix/controllers/GMAStage.js
	assets/opstools/GMAMatrix/views/GMAMatrix/GMAMatrix.ejs
	assets/opstools/GMAMatrix/views/GMAStage/GMAStage.ejs
Merge branch 'develop' of https://github.com/appdevdesigns/opstool-gmaMatrix into develop