Addition of Functor to encapsulate static and non-static class member JsonObject loading functions
-- May need moving of Functor definitions to new file?
Merge remote branch 'origin/pr/3164'

Conflicts:
	init.cpp: added lab_note and hint