merging core branch into dev. big refactor, merging packages into odata-engine-core now