Ensure kinetic functions are switching between templates
Merge https://github.com/ugaffoor/Telus-GCNet
Merge https://github.com/ugaffoor/Telus-GCNet

Conflicts:
	packages/base/resources/js/dataAndTables.js
Merge https://github.com/ugaffoor/Telus-GCNet
Merge https://github.com/ugaffoor/Telus-GCNet

Conflicts:
	core/interface/fragments/applicationFootContent.jspf
	packages/base/resources/js/dataAndTables.js
Merge https://github.com/ugaffoor/Telus-GCNet