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
Merge branch 'feature-release' into develop
Session handling improvements
Changed measurement values are now saved back to the server
Minor bug fixes and code cleanup