Cleanup Images into xcassets
Merge remote-tracking branch 'origin/3.0-push' into 3.0-push