Renamed xplat repo name
Merge pull request #1352 from amarzavery/rename

Renamed xplat repo name
Resolved conflicts while merging master to dev