WP3.8 Compatibility update
Added SVG images
Fixed merge conflicts