Simplified the template implementation of List and Map.
Simplified the template implementation of List and Map.
Merge branch 'list-map' into merge-test2

Conflicts:
	ConfigureChecks.cmake