commit after pull
x
Merge https://github.com/ugaffoor/Telus-GCNet

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

Conflicts:
	packages/base/angularTest.jsp
animate between template view and table view.
loader
styling
code cleanup
Merge https://github.com/ugaffoor/Telus-GCNet