Renamed Ontology components
Various variable name changes to select concept
Merge remote-tracking branch 'origin/master'
Implemented entry selector