SD-485 : implement versioning on server
SD-485 : implement versioning on server
Merge remote-tracking branch 'mugur/master'