Updating roadmap
Adding new versions
Merge branch 'UPS_RELEASE'