Re-syncronization of versions to make compilable

7 files changed