Updated core.py with dbpedia property search
Resolved conflict
Merge branch 'master' of https://github.com/Jens84/dmup