Merge "Renamed Atlas to avoid name clash with new version" into tizen