Updated two fields that had the wrong call to the email address object -JEuvin
Merge branch 'master' of https://github.com/itraycer/iTraycer into jeuvin
Merge branch 'jhargrave' of https://github.com/itraycer/iTraycer into jeuvin

Conflicts:
	js/mtsBillingConfirmation.js
PDF viewer workflow updates, that Jose and I made together.
Merge branch 'master' of https://github.com/itraycer/iTraycer into jeuvin

Conflicts:
	res/MTS.sql
Merge branch 'jhargrave' of https://github.com/itraycer/iTraycer into jeuvin

Conflicts:
	js/mtsContextManager.js
	js/mtsHandlePDF.js
	res/MTS.sql
fix for Jose.
Merge branch 'jhargrave' of https://github.com/itraycer/iTraycer into jeuvin

Conflicts:
	index.html
Merge branch 'jpittman' of https://github.com/itraycer/iTraycer into jeuvin

Conflicts:
	index.html
	js/mtsAllocation.js
	js/mtsContextManager.js
	js/mtsGlobal.js
	js/mtscollapsiblelistcarousel.js
Merge DRiley into my branch -JEuvin
Merge Robs branch into mine -JEuvin
Merging all changes from all branches to mine -JEuvin
Merged master into my branch -JEuvin
making more like master
Merge branch 'master' of https://github.com/itraycer/iTraycer into jeuvin
making more like master
Merge branch 'master' into jpittman

Conflicts:
	index.html
	js/mtsContextManager.js
Merge branch 'master' into jpittman
Fixed spacing changes -JEuvin
Merge branch 'master' of https://github.com/itraycer/iTraycer into jhargrave