added images for tab bar controller + app icons + launch images
fixed conflicts