Removed ability to load concepts from dictionary via concept id. Having getConcept take an Object risks type errors and we shouldn't ever be loading concepts
by id. Now loading is restricted to UUIDs and mappings - both contained in Strings
Merge remote-tracking branch 'upstream/master'