updates
Merge https://github.com/ugaffoor/Telus-GCNet

Conflicts:
	packages/base/resources/js/dataAndTables.js