[OLINGO-231] Fixed merge problems and changed version
33 files changed