+ initial GMA Matrix framework
Merge branch 'develop' into gmaMatrixTool
+ GMA Matrix now shows in OpsPortal, with Report List displayed
Merge branch 'develop' into gmaMatrixTool
+ Assignments, Measurements and more work on stage
- removed ReportList / item.ejs
+ measurements and placements being returned from server
+ added .css and .js files necessary in order to work offline
+ added LMIDefinitions & NotPlacedList to chart
Merge branch 'workOffline' into develop

Conflicts:
	config/appdev.js
* fixed changes to gitignore
Merge branch 'gmaMatrixTool' into develop

Conflicts:
	assets/pages/hris/router.js
	config/opsportal.js